diff --git a/src/app/modules/configuration/config-editor.ts b/src/app/modules/configuration/config-editor.ts
index bde9502..b12502a 100644
--- a/src/app/modules/configuration/config-editor.ts
+++ b/src/app/modules/configuration/config-editor.ts
@@ -16,8 +16,8 @@ export class CreConfigEditor extends ErrorHandlingComponent {
keys = {
INSTANCE_NAME: Config.INSTANCE_NAME,
- INSTANCE_LOGO_PATH: Config.INSTANCE_LOGO_PATH,
- INSTANCE_ICON_PATH: Config.INSTANCE_ICON_PATH,
+ INSTANCE_LOGO_SET: Config.INSTANCE_LOGO_SET,
+ INSTANCE_ICON_SET: Config.INSTANCE_ICON_SET,
INSTANCE_URL: Config.INSTANCE_URL,
DATABASE_URL: Config.DATABASE_URL,
DATABASE_USER: Config.DATABASE_USER,
diff --git a/src/app/modules/configuration/config-image.html b/src/app/modules/configuration/config-image.html
index 084aad1..c801323 100644
--- a/src/app/modules/configuration/config-image.html
+++ b/src/app/modules/configuration/config-image.html
@@ -18,7 +18,7 @@
![]()
diff --git a/src/app/modules/configuration/config.ts b/src/app/modules/configuration/config.ts
index 29acafb..d40479e 100644
--- a/src/app/modules/configuration/config.ts
+++ b/src/app/modules/configuration/config.ts
@@ -1,10 +1,20 @@
-import {AfterViewInit, Component, ContentChild, Directive, EventEmitter, Input, Output, ViewChild, ViewEncapsulation} from '@angular/core'
+import {
+ AfterViewInit,
+ Component,
+ ContentChild,
+ Directive,
+ EventEmitter,
+ Input,
+ Output,
+ ViewChild,
+ ViewEncapsulation
+} from '@angular/core'
import {ConfigService} from '../shared/service/config.service'
import {Config, ConfigControl} from '../shared/model/config.model'
import {SubscribingComponent} from '../shared/components/subscribing.component'
import {ErrorService} from '../shared/service/error.service'
import {ActivatedRoute, Router} from '@angular/router'
-import {formatDate, formatDateTime, getFileUrl, readFile} from '../shared/utils/utils'
+import {formatDate, formatDateTime, getConfiguredImageUrl, getFileUrl, readFile} from '../shared/utils/utils'
import {AbstractControl} from '@angular/forms'
import {CrePromptDialog} from '../shared/components/dialogs/dialogs'
@@ -121,9 +131,9 @@ export class CreImageConfig extends _CreConfigBase {
readFile(file, (content) => this.updatedImage = content)
}
-
- get configuredImageUrl(): string {
- return getFileUrl(this.config.content)
+ get imageUrl(): string {
+ const path = this.config.key == Config.INSTANCE_ICON_SET ? 'icon' : 'logo'
+ return getConfiguredImageUrl(path)
}
}
diff --git a/src/app/modules/material-type/material-type.module.ts b/src/app/modules/material-type/material-type.module.ts
index 591a8a8..1df904c 100644
--- a/src/app/modules/material-type/material-type.module.ts
+++ b/src/app/modules/material-type/material-type.module.ts
@@ -6,6 +6,9 @@ import { ListComponent } from './pages/list/list.component';
import {SharedModule} from "../shared/shared.module";
import { AddComponent } from './pages/add/add.component';
import { EditComponent } from './pages/edit/edit.component';
+import {CreActionBarModule} from '../shared/components/action-bar/action-bar.module'
+import {CreButtonsModule} from '../shared/components/buttons/buttons.module'
+import {CreTablesModule} from '../shared/components/tables/tables.module'
@NgModule({
@@ -13,7 +16,10 @@ import { EditComponent } from './pages/edit/edit.component';
imports: [
CommonModule,
MaterialTypeRoutingModule,
- SharedModule
+ SharedModule,
+ CreActionBarModule,
+ CreButtonsModule,
+ CreTablesModule
]
})
export class MaterialTypeModule { }
diff --git a/src/app/modules/material-type/pages/list/list.component.html b/src/app/modules/material-type/pages/list/list.component.html
index f70251f..bf32816 100644
--- a/src/app/modules/material-type/pages/list/list.component.html
+++ b/src/app/modules/material-type/pages/list/list.component.html
@@ -1,7 +1,40 @@
-
-
+
+
+ Ajouter
+
+
+
+
+ Il n'y a actuellement aucun type de produit enregistré dans le système.
+ Vous pouvez en créer un ici.
+
+
+
+
+ Nom |
+ {{materialType.name}} |
+
+
+
+ Préfix |
+ {{materialType.prefix}} |
+
+
+
+ Utilise les pourcentages |
+ {{materialType.usePercentages ? 'Oui' : 'Non'}} |
+
+
+
+ |
+
+
+ Modifier
+
+ |
+
+
diff --git a/src/app/modules/material-type/pages/list/list.component.ts b/src/app/modules/material-type/pages/list/list.component.ts
index 2556388..c25e58f 100644
--- a/src/app/modules/material-type/pages/list/list.component.ts
+++ b/src/app/modules/material-type/pages/list/list.component.ts
@@ -5,6 +5,8 @@ import {Permission} from '../../../shared/model/user'
import {ActivatedRoute, Router} from '@angular/router'
import {ErrorService} from '../../../shared/service/error.service'
import {AppState} from '../../../shared/app-state'
+import {tap} from 'rxjs/operators'
+import {AccountService} from '../../../accounts/services/account.service'
@Component({
selector: 'cre-list',
@@ -12,23 +14,16 @@ import {AppState} from '../../../shared/app-state'
styleUrls: ['./list.component.sass']
})
export class ListComponent extends ErrorHandlingComponent {
- materialTypes$ = this.materialTypeService.all
- columns = [
- {def: 'name', title: 'Nom', valueFn: t => t.name},
- {def: 'prefix', title: 'Préfixe', valueFn: t => t.prefix},
- {def: 'usePercentages', title: 'Utilise les pourcentages', valueFn: t => t.usePercentages ? 'Oui' : 'Non'}
- ]
- buttons = [
- {
- text: 'Modifier',
- linkFn: t => `/catalog/materialtype/edit/${t.id}`,
- permission: Permission.EDIT_MATERIAL_TYPES,
- disabledFn: t => t.systemType
- }
- ]
+ materialTypes$ = this.materialTypeService.all.pipe(
+ tap(materialTypes => this.materialTypesEmpty = materialTypes.length <= 0)
+ )
+ materialTypesEmpty = false
+
+ columns = ['name', 'prefix', 'usePercentages', 'editButton']
constructor(
private materialTypeService: MaterialTypeService,
+ private accountService: AccountService,
private appState: AppState,
errorService: ErrorService,
router: Router,
@@ -37,4 +32,8 @@ export class ListComponent extends ErrorHandlingComponent {
super(errorService, activatedRoute, router)
this.appState.title = 'Types de produit'
}
+
+ get hasEditPermission(): boolean {
+ return this.accountService.hasPermission(Permission.EDIT_COMPANIES)
+ }
}
diff --git a/src/app/modules/material/material.module.ts b/src/app/modules/material/material.module.ts
index 6ccb444..782b3ef 100644
--- a/src/app/modules/material/material.module.ts
+++ b/src/app/modules/material/material.module.ts
@@ -6,9 +6,13 @@ import {InventoryComponent} from './pages/inventory/inventory.component';
import {SharedModule} from "../shared/shared.module";
import {AddComponent} from './pages/add/add.component';
import {EditComponent} from './pages/edit/edit.component';
-import {ColorsModule} from '../colors/colors.module'
+import {RecipesModule} from '../recipes/recipes.module'
import {MatSortModule} from '@angular/material/sort'
import {FormsModule} from '@angular/forms'
+import {CreTablesModule} from '../shared/components/tables/tables.module'
+import {CreInputsModule} from '../shared/components/inputs/inputs.module'
+import {CreButtonsModule} from '../shared/components/buttons/buttons.module'
+import {CreActionBarModule} from '../shared/components/action-bar/action-bar.module'
@NgModule({
@@ -17,9 +21,13 @@ import {FormsModule} from '@angular/forms'
CommonModule,
MaterialRoutingModule,
SharedModule,
- ColorsModule,
+ RecipesModule,
MatSortModule,
- FormsModule
+ FormsModule,
+ CreTablesModule,
+ CreInputsModule,
+ CreButtonsModule,
+ CreActionBarModule
]
})
export class MaterialModule {
diff --git a/src/app/modules/material/pages/inventory/inventory.component.html b/src/app/modules/material/pages/inventory/inventory.component.html
index a964091..130ff57 100644
--- a/src/app/modules/material/pages/inventory/inventory.component.html
+++ b/src/app/modules/material/pages/inventory/inventory.component.html
@@ -1,62 +1,59 @@
-
+
+
+
-
+ Il n'y a actuellement aucun produit enregistré dans le système.
+ Vous pouvez en créer un ici.
+
+
+
+
+ [filterPredicate]="materialFilterPredicate"
+ [filter]="filter"
+ [data]="materials"
+ [columns]="columns">
- Code |
+ Code |
{{material.name}} |
- Type de produit |
+ Type de produit |
{{material.materialType.name}} |
@@ -68,9 +65,7 @@
|
- |
+
diff --git a/src/app/modules/material/pages/inventory/inventory.component.sass b/src/app/modules/material/pages/inventory/inventory.component.sass
index 20ded20..5867821 100644
--- a/src/app/modules/material/pages/inventory/inventory.component.sass
+++ b/src/app/modules/material/pages/inventory/inventory.component.sass
@@ -1,8 +1,9 @@
-.input-group-append button
- border-radius: 0 4px 4px 0
-
mat-select
margin-top: 4px
-.form-control
- width: 6rem
+.input-group
+ cre-input
+ width: 6rem
+
+ .input-group-append button
+ border-radius: 0 4px 4px 0
diff --git a/src/app/modules/material/pages/inventory/inventory.component.ts b/src/app/modules/material/pages/inventory/inventory.component.ts
index aafe764..81f914f 100644
--- a/src/app/modules/material/pages/inventory/inventory.component.ts
+++ b/src/app/modules/material/pages/inventory/inventory.component.ts
@@ -4,14 +4,17 @@ import {MaterialService} from '../../service/material.service'
import {Permission} from '../../../shared/model/user'
import {ActivatedRoute, Router} from '@angular/router'
import {ErrorService} from '../../../shared/service/error.service'
-import {Material, openSimdut} from '../../../shared/model/material.model'
+import {Material, materialFilterFieldSeparator, materialMatchesFilter, openSimdut} from '../../../shared/model/material.model'
import {AccountService} from '../../../accounts/services/account.service'
import {convertQuantity, UNIT_MILLILITER} from '../../../shared/units'
import {MatSort} from '@angular/material/sort'
-import {MatTableDataSource} from '@angular/material/table'
import {MaterialTypeService} from '../../../material-type/service/material-type.service'
import {InventoryService} from '../../service/inventory.service'
import {AppState} from '../../../shared/app-state'
+import {FormControl} from '@angular/forms'
+import {map} from 'rxjs/operators'
+import {CreInputEntry} from '../../../shared/components/inputs/inputs'
+import {round} from '../../../shared/utils/utils'
@Component({
selector: 'cre-list',
@@ -21,9 +24,10 @@ import {AppState} from '../../../shared/app-state'
export class InventoryComponent extends ErrorHandlingComponent {
@ViewChild(MatSort) sort: MatSort
- materials: Material[] | null
- materialTypes$ = this.materialTypeService.all
- dataSource: MatTableDataSource
+ materials: Material[] | null = []
+ materialTypesEntries$ = this.materialTypeService.all.pipe(map(materialTypes => {
+ return materialTypes.map(materialType => new CreInputEntry(materialType.id, materialType.name))
+ }))
columns = ['name', 'materialType', 'quantity', 'addQuantity', 'lowQuantityIcon', 'simdutIcon', 'editButton', 'openSimdutButton']
hoveredMaterial: Material | null
@@ -31,8 +35,16 @@ export class InventoryComponent extends ErrorHandlingComponent {
units = UNIT_MILLILITER
lowQuantityThreshold = 100 // TEMPORARY will be in the application settings
- materialTypeFilter = 1
- materialNameFilter = ''
+
+ materialFilterPredicate = materialMatchesFilter
+
+ private materialTypeFilter = 1
+ private materialNameFilter = ''
+ private hideLowQuantity = false
+
+ materialTypeFilterControl = new FormControl(this.materialTypeFilter)
+ materialNameFilterControl = new FormControl(this.materialNameFilter)
+ hideLowQuantityControl = new FormControl(this.hideLowQuantity)
constructor(
private materialService: MaterialService,
@@ -53,38 +65,25 @@ export class InventoryComponent extends ErrorHandlingComponent {
this.subscribe(
this.materialService.allNotMixType,
- materials => {
- this.materials = materials
- this.dataSource = this.setupDataSource()
- },
+ materials => this.materials = materials,
true,
1
)
- }
- setupDataSource(): MatTableDataSource {
- this.dataSource = new MatTableDataSource(this.materials)
- this.dataSource.sortingDataAccessor = (material, header) => {
- switch (header) {
- case 'materialType':
- return material[header].name
- case 'lowQuantityIcon':
- return this.isLowQuantity(material)
- default:
- return material[header]
- }
- }
- this.dataSource.filterPredicate = (material, filter) => {
- return (!this.materialTypeFilter || this.materialTypeFilter === 1 || material.materialType.id === this.materialTypeFilter) &&
- (!this.materialNameFilter || material.name.toLowerCase().includes(this.materialNameFilter.toLowerCase()))
- }
+ this.subscribe(
+ this.materialTypeFilterControl.valueChanges,
+ filter => this.materialTypeFilter = filter
+ )
- this.dataSource.sort = this.sort
- return this.dataSource
- }
+ this.subscribe(
+ this.materialNameFilterControl.valueChanges,
+ filter => this.materialNameFilter = filter
+ )
- filterDataSource() {
- this.dataSource.filter = 'filter'
+ this.subscribe(
+ this.hideLowQuantityControl.valueChanges,
+ filter => this.hideLowQuantity = filter
+ )
}
isLowQuantity(material: Material) {
@@ -92,7 +91,7 @@ export class InventoryComponent extends ErrorHandlingComponent {
}
getQuantity(material: Material): number {
- return Math.round(convertQuantity(material.inventoryQuantity, UNIT_MILLILITER, this.units) * 100) / 100
+ return round(convertQuantity(material.inventoryQuantity, UNIT_MILLILITER, this.units), 2)
}
materialHasSimdut(material: Material): boolean {
@@ -118,6 +117,10 @@ export class InventoryComponent extends ErrorHandlingComponent {
)
}
+ get filter(): string {
+ return [this.materialTypeFilter, this.materialNameFilter, this.hideLowQuantity, this.lowQuantityThreshold].join(materialFilterFieldSeparator)
+ }
+
get canEditMaterial(): boolean {
return this.accountService.hasPermission(Permission.EDIT_MATERIALS)
}
diff --git a/src/app/modules/recipes/add.html b/src/app/modules/recipes/add.html
new file mode 100644
index 0000000..aa827e1
--- /dev/null
+++ b/src/app/modules/recipes/add.html
@@ -0,0 +1,10 @@
+
+
+ Retour
+
+
+
+
+
+
+
diff --git a/src/app/modules/colors/bpac.js b/src/app/modules/recipes/bpac.js
similarity index 100%
rename from src/app/modules/colors/bpac.js
rename to src/app/modules/recipes/bpac.js
diff --git a/src/app/modules/colors/components/images-editor/images-editor.component.html b/src/app/modules/recipes/components/images-editor/images-editor.component.html
similarity index 89%
rename from src/app/modules/colors/components/images-editor/images-editor.component.html
rename to src/app/modules/recipes/components/images-editor/images-editor.component.html
index e07f7b8..abd0574 100644
--- a/src/app/modules/colors/components/images-editor/images-editor.component.html
+++ b/src/app/modules/recipes/components/images-editor/images-editor.component.html
@@ -4,6 +4,8 @@
+
Aucune image n'est associée à cette couleur
+
![]()
diff --git a/src/app/modules/colors/components/images-editor/images-editor.component.sass b/src/app/modules/recipes/components/images-editor/images-editor.component.sass
similarity index 100%
rename from src/app/modules/colors/components/images-editor/images-editor.component.sass
rename to src/app/modules/recipes/components/images-editor/images-editor.component.sass
diff --git a/src/app/modules/colors/components/images-editor/images-editor.component.ts b/src/app/modules/recipes/components/images-editor/images-editor.component.ts
similarity index 100%
rename from src/app/modules/colors/components/images-editor/images-editor.component.ts
rename to src/app/modules/recipes/components/images-editor/images-editor.component.ts
diff --git a/src/app/modules/colors/components/mix-table/mix-table.component.html b/src/app/modules/recipes/components/mix-table/mix-table.component.html
similarity index 100%
rename from src/app/modules/colors/components/mix-table/mix-table.component.html
rename to src/app/modules/recipes/components/mix-table/mix-table.component.html
diff --git a/src/app/modules/colors/components/mix-table/mix-table.component.sass b/src/app/modules/recipes/components/mix-table/mix-table.component.sass
similarity index 100%
rename from src/app/modules/colors/components/mix-table/mix-table.component.sass
rename to src/app/modules/recipes/components/mix-table/mix-table.component.sass
diff --git a/src/app/modules/colors/components/mix-table/mix-table.component.ts b/src/app/modules/recipes/components/mix-table/mix-table.component.ts
similarity index 97%
rename from src/app/modules/colors/components/mix-table/mix-table.component.ts
rename to src/app/modules/recipes/components/mix-table/mix-table.component.ts
index 2018c5a..bd430a6 100644
--- a/src/app/modules/colors/components/mix-table/mix-table.component.ts
+++ b/src/app/modules/recipes/components/mix-table/mix-table.component.ts
@@ -1,5 +1,5 @@
import {Component, EventEmitter, Input, Output, ViewChild} from '@angular/core'
-import {Mix, MixMaterial, MixMaterialDto, mixMaterialsAsMixMaterialsDto, Recipe} from '../../../shared/model/recipe.model'
+import {Mix, MixMaterial, 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'
@@ -60,7 +60,7 @@ export class MixTableComponent extends SubscribingComponent {
this.mixColumns = this.COLUMNS_EDIT
}
- this.mixMaterials = mixMaterialsAsMixMaterialsDto(this.mix)
+ this.mixMaterials = mixMaterialsToMixMaterialsDto(this.mix)
this.subscribe(
this.units$,
@@ -191,12 +191,13 @@ export class MixTableComponent extends SubscribingComponent {
materialId: quantity.materialId,
quantity: this.calculateQuantity(index),
isPercents: quantity.isPercents,
- position: quantity.position
+ position: quantity.position,
+ units: UNIT_MILLILITER
})
}
private convertQuantities(newUnit: string) {
- this.mixMaterials.forEach(q => q.quantity = convertMixMaterialQuantity(q, this.units, newUnit))
+ this.mixMaterials.forEach(q => q.quantity = convertMixMaterialQuantity(q, newUnit))
this.units = newUnit
}
diff --git a/src/app/modules/colors/components/mixes-card/mixes-card.component.html b/src/app/modules/recipes/components/mixes-card/mixes-card.component.html
similarity index 88%
rename from src/app/modules/colors/components/mixes-card/mixes-card.component.html
rename to src/app/modules/recipes/components/mixes-card/mixes-card.component.html
index b6766df..c8a093a 100644
--- a/src/app/modules/colors/components/mixes-card/mixes-card.component.html
+++ b/src/app/modules/recipes/components/mixes-card/mixes-card.component.html
@@ -3,6 +3,8 @@
Mélanges
+ Il n'y a aucun mélange dans cette couleur
+
Étapes
-
+
{{step.position}}.{{step.message}}
diff --git a/src/app/modules/colors/components/step-list/step-list.component.sass b/src/app/modules/recipes/components/step-list/step-list.component.sass
similarity index 100%
rename from src/app/modules/colors/components/step-list/step-list.component.sass
rename to src/app/modules/recipes/components/step-list/step-list.component.sass
diff --git a/src/app/modules/colors/components/step-list/step-list.component.ts b/src/app/modules/recipes/components/step-list/step-list.component.ts
similarity index 100%
rename from src/app/modules/colors/components/step-list/step-list.component.ts
rename to src/app/modules/recipes/components/step-list/step-list.component.ts
diff --git a/src/app/modules/colors/components/step-table/step-table.component.html b/src/app/modules/recipes/components/step-table/step-table.component.html
similarity index 100%
rename from src/app/modules/colors/components/step-table/step-table.component.html
rename to src/app/modules/recipes/components/step-table/step-table.component.html
diff --git a/src/app/modules/colors/components/step-table/step-table.component.sass b/src/app/modules/recipes/components/step-table/step-table.component.sass
similarity index 100%
rename from src/app/modules/colors/components/step-table/step-table.component.sass
rename to src/app/modules/recipes/components/step-table/step-table.component.sass
diff --git a/src/app/modules/colors/components/step-table/step-table.component.ts b/src/app/modules/recipes/components/step-table/step-table.component.ts
similarity index 100%
rename from src/app/modules/colors/components/step-table/step-table.component.ts
rename to src/app/modules/recipes/components/step-table/step-table.component.ts
diff --git a/src/app/modules/colors/components/unit-selector/unit-selector.component.html b/src/app/modules/recipes/components/unit-selector/unit-selector.component.html
similarity index 89%
rename from src/app/modules/colors/components/unit-selector/unit-selector.component.html
rename to src/app/modules/recipes/components/unit-selector/unit-selector.component.html
index 4b82721..b00e879 100644
--- a/src/app/modules/colors/components/unit-selector/unit-selector.component.html
+++ b/src/app/modules/recipes/components/unit-selector/unit-selector.component.html
@@ -1,6 +1,6 @@
Unités
-
+
Millilitres
Litres
diff --git a/src/app/modules/colors/components/unit-selector/unit-selector.component.sass b/src/app/modules/recipes/components/unit-selector/unit-selector.component.sass
similarity index 100%
rename from src/app/modules/colors/components/unit-selector/unit-selector.component.sass
rename to src/app/modules/recipes/components/unit-selector/unit-selector.component.sass
diff --git a/src/app/modules/colors/components/unit-selector/unit-selector.component.ts b/src/app/modules/recipes/components/unit-selector/unit-selector.component.ts
similarity index 53%
rename from src/app/modules/colors/components/unit-selector/unit-selector.component.ts
rename to src/app/modules/recipes/components/unit-selector/unit-selector.component.ts
index 418677f..9f8d192 100644
--- a/src/app/modules/colors/components/unit-selector/unit-selector.component.ts
+++ b/src/app/modules/recipes/components/unit-selector/unit-selector.component.ts
@@ -1,17 +1,28 @@
-import {Component, EventEmitter, Input, Output} from '@angular/core';
+import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core'
import {UNIT_GALLON, UNIT_LITER, UNIT_MILLILITER} from "../../../shared/units";
+import {FormControl} from '@angular/forms'
@Component({
selector: 'cre-unit-selector',
templateUrl: './unit-selector.component.html',
styleUrls: ['./unit-selector.component.sass']
})
-export class UnitSelectorComponent {
+export class UnitSelectorComponent implements OnInit {
readonly unitConstants = {UNIT_MILLILITER, UNIT_LITER, UNIT_GALLON}
@Input() unit = UNIT_MILLILITER
@Input() showLabel = true
@Input() short = false
+ @Input() control: FormControl | null
@Output() unitChange = new EventEmitter()
+
+ ngOnInit() {
+ this.control?.setValue(this.unit)
+ }
+
+ onUnitChange(newUnit: string) {
+ this.control?.setValue(newUnit)
+ this.unitChange.emit(newUnit)
+ }
}
diff --git a/src/app/modules/recipes/edit.html b/src/app/modules/recipes/edit.html
new file mode 100644
index 0000000..690dbf6
--- /dev/null
+++ b/src/app/modules/recipes/edit.html
@@ -0,0 +1,36 @@
+
+
+
+ Retour
+
+
+
+ Supprimer
+ Enregistrer
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Retour
+
+
+
+
+
+
+
+
+ Version Excel
+
+ Enregistrer
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Il n'y a actuellement aucune bannière enregistrée dans le système.
+ Vous pouvez en créer une ici.
+
+
-
- Recherche
-
-
-
-
-
-
+
+
+
+
+
+ Ajouter
+
+
+
+
+
+ Il n'y a actuellement aucune bannière enregistrée dans le système.
+ Vous pouvez en créer une ici.
+
+
+
+ Il n'y a actuellement aucune recette enregistrée dans le système.
+ Vous pouvez en créer une ici.
+
+
| Nom |
@@ -85,19 +89,16 @@
|
-
-
+ |
+ Voir
|
|
-
-
+ |
+ Modifier
|
-
- |
- |
-
+
diff --git a/src/app/modules/recipes/list.ts b/src/app/modules/recipes/list.ts
new file mode 100644
index 0000000..121f6e7
--- /dev/null
+++ b/src/app/modules/recipes/list.ts
@@ -0,0 +1,110 @@
+import {ChangeDetectorRef, Component} from '@angular/core'
+import {ErrorHandlingComponent} from '../shared/components/subscribing.component'
+import {Company} from '../shared/model/company.model'
+import {getRecipeLuma, Recipe, recipeMatchesFilter} from '../shared/model/recipe.model'
+import {CompanyService} from '../company/service/company.service'
+import {RecipeService} from './services/recipe.service'
+import {AccountService} from '../accounts/services/account.service'
+import {ConfigService} from '../shared/service/config.service'
+import {AppState} from '../shared/app-state'
+import {ErrorService} from '../shared/service/error.service'
+import {ActivatedRoute, Router} from '@angular/router'
+import {Config} from '../shared/model/config.model'
+import {Permission} from '../shared/model/user'
+import {FormControl} from '@angular/forms'
+
+@Component({
+ selector: 'cre-recipe-list',
+ templateUrl: 'list.html',
+ styleUrls: ['recipes.sass']
+})
+export class RecipeList extends ErrorHandlingComponent {
+ companies: Company[] = []
+ recipes: Map
= new Map()
+ columns = ['name', 'description', 'color', 'sample', 'iconNotApproved', 'buttonView', 'buttonEdit']
+ panelForcedExpanded = false
+
+ searchControl: FormControl
+ searchQuery = ''
+
+ recipeFilterPredicate = recipeMatchesFilter
+
+ constructor(
+ private companyService: CompanyService,
+ private recipeService: RecipeService,
+ private accountService: AccountService,
+ private configService: ConfigService,
+ private cdRef: ChangeDetectorRef,
+ private appState: AppState,
+ errorService: ErrorService,
+ router: Router,
+ activatedRoute: ActivatedRoute
+ ) {
+ super(errorService, activatedRoute, router)
+ }
+
+ ngOnInit() {
+ super.ngOnInit()
+ this.appState.title = 'Explorateur'
+
+ // Navigate to configs if server is in emergency mode
+ this.subscribe(
+ this.configService.get(Config.EMERGENCY_MODE),
+ config => {
+ if (config.content == 'true') {
+ this.urlUtils.navigateTo('/admin/config/')
+ }
+ }
+ )
+
+ this.fetchCompanies()
+ this.fetchRecipes()
+
+ this.searchControl = new FormControl('')
+ this.subscribe(
+ this.searchControl.valueChanges,
+ value => {
+ this.searchQuery = value
+ if (value.length > 0 && !this.panelForcedExpanded) {
+ this.panelForcedExpanded = true
+ this.cdRef.detectChanges()
+ }
+ }
+ )
+ }
+
+ private fetchCompanies() {
+ this.subscribe(
+ this.companyService.all,
+ companies => this.companies = companies
+ )
+ }
+
+ private fetchRecipes() {
+ this.subscribe(
+ this.recipeService.allByCompany,
+ recipes => this.recipes = recipes,
+ true
+ )
+ }
+
+ isCompanyHidden(company: Company): boolean {
+ const companyRecipes = this.recipes.get(company.id)
+ return !(companyRecipes && companyRecipes.length >= 0) ||
+ this.searchQuery && this.searchQuery.length > 0 &&
+ !companyRecipes.some(recipe => this.recipeFilterPredicate(recipe, this.searchQuery))
+ }
+
+
+ isLight(recipe: Recipe): boolean {
+ return getRecipeLuma(recipe) > 200
+ }
+
+ get hasEditPermission(): boolean {
+ return this.accountService.hasPermission(Permission.EDIT_RECIPES)
+ }
+
+ get hasCompanyEditPermission(): boolean {
+ return this.accountService.hasPermission(Permission.EDIT_COMPANIES)
+ }
+}
diff --git a/src/app/modules/recipes/mix/add.html b/src/app/modules/recipes/mix/add.html
new file mode 100644
index 0000000..d6a6301
--- /dev/null
+++ b/src/app/modules/recipes/mix/add.html
@@ -0,0 +1,20 @@
+
+
+
+ Retour
+
+
+ Enregistrer
+
+
+
+
+
+ Ajouter un mélange à la couleur {{recipe.company.name}} - {{recipe.name}}
+
+
+
diff --git a/src/app/modules/recipes/mix/edit.html b/src/app/modules/recipes/mix/edit.html
new file mode 100644
index 0000000..14267ca
--- /dev/null
+++ b/src/app/modules/recipes/mix/edit.html
@@ -0,0 +1,25 @@
+
+
+
+ Retour
+
+
+
+ Enregistrer
+
+
+
+
+
+
+ Modification du mélange {{mix.mixType.name}} de la recette {{recipe.company.name}} - {{recipe.name}}
+
+
+
diff --git a/src/app/modules/recipes/mix/form.html b/src/app/modules/recipes/mix/form.html
new file mode 100644
index 0000000..8deb6d4
--- /dev/null
+++ b/src/app/modules/recipes/mix/form.html
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
diff --git a/src/app/modules/recipes/mix/info-form.html b/src/app/modules/recipes/mix/info-form.html
new file mode 100644
index 0000000..adb993d
--- /dev/null
+++ b/src/app/modules/recipes/mix/info-form.html
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/modules/recipes/mix/materials-form-combo-box.html b/src/app/modules/recipes/mix/materials-form-combo-box.html
new file mode 100644
index 0000000..fc440c9
--- /dev/null
+++ b/src/app/modules/recipes/mix/materials-form-combo-box.html
@@ -0,0 +1,5 @@
+
+
diff --git a/src/app/modules/recipes/mix/materials-form.html b/src/app/modules/recipes/mix/materials-form.html
new file mode 100644
index 0000000..5c7742c
--- /dev/null
+++ b/src/app/modules/recipes/mix/materials-form.html
@@ -0,0 +1,76 @@
+
+
+ Il n'y a actuellement aucun produit enregistré dans le système.
+ Vous pouvez en créer un ici.
+
+
+
+
+
+ Position |
+ {{mixMaterial.position}} |
+
+
+
+ |
+
+
+
+ |
+
+
+
+ Produit |
+
+
+
+ |
+
+
+
+ Quantité |
+
+
+ |
+
+
+
+ Unités |
+
+
+
+
+
+ %
+
+ |
+
+
+
+
+ Ajouter
+
+ |
+
+ Retirer
+
+ |
+
+
+
+
diff --git a/src/app/modules/shared/components/action-bar/action-bar.ts b/src/app/modules/shared/components/action-bar/action-bar.ts
index 506bed9..61df16b 100644
--- a/src/app/modules/shared/components/action-bar/action-bar.ts
+++ b/src/app/modules/shared/components/action-bar/action-bar.ts
@@ -1,4 +1,4 @@
-import {Component} from '@angular/core'
+import {Component, Input} from '@angular/core'
@Component({
selector: 'cre-action-group',
@@ -11,4 +11,6 @@ export class CreActionGroup {}
selector: 'cre-action-bar',
templateUrl: 'action-bar.html'
})
-export class CreActionBar {}
+export class CreActionBar {
+ @Input() reverse = false
+}
diff --git a/src/app/modules/shared/components/action-bar/action-group.html b/src/app/modules/shared/components/action-bar/action-group.html
index dfdbcc7..01b5f5d 100644
--- a/src/app/modules/shared/components/action-bar/action-group.html
+++ b/src/app/modules/shared/components/action-bar/action-group.html
@@ -1,3 +1,6 @@
-
-
+
diff --git a/src/app/modules/shared/components/alerts/alerts.html b/src/app/modules/shared/components/alerts/alerts.html
new file mode 100644
index 0000000..f9a034d
--- /dev/null
+++ b/src/app/modules/shared/components/alerts/alerts.html
@@ -0,0 +1,3 @@
+
+
+
diff --git a/src/app/modules/shared/components/alerts/alerts.module.ts b/src/app/modules/shared/components/alerts/alerts.module.ts
new file mode 100644
index 0000000..110fde4
--- /dev/null
+++ b/src/app/modules/shared/components/alerts/alerts.module.ts
@@ -0,0 +1,14 @@
+import {NgModule} from '@angular/core';
+import {WarningAlert} from './alerts';
+
+@NgModule({
+ declarations: [
+ WarningAlert
+ ],
+ exports: [
+ WarningAlert
+ ],
+ imports: []
+})
+export class CreAlertsModule {
+}
diff --git a/src/app/modules/shared/components/alerts/alerts.ts b/src/app/modules/shared/components/alerts/alerts.ts
new file mode 100644
index 0000000..e31da46
--- /dev/null
+++ b/src/app/modules/shared/components/alerts/alerts.ts
@@ -0,0 +1,10 @@
+import {Component, ViewEncapsulation} from '@angular/core';
+
+@Component({
+ selector: 'cre-warning-alert',
+ templateUrl: 'alerts.html',
+ encapsulation: ViewEncapsulation.None
+})
+export class WarningAlert {
+
+}
diff --git a/src/app/modules/shared/components/forms/buttons.ts b/src/app/modules/shared/components/forms/buttons.ts
new file mode 100644
index 0000000..0cebdc4
--- /dev/null
+++ b/src/app/modules/shared/components/forms/buttons.ts
@@ -0,0 +1,17 @@
+import {Component, EventEmitter, Input, Output} from '@angular/core';
+import {ICreForm} from './forms';
+
+@Component({
+ selector: 'cre-submit-button',
+ templateUrl: 'submit-button.html'
+})
+export class CreSubmitButton {
+ @Input() form: ICreForm
+ @Input() valid: boolean | null
+
+ @Output() submit = new EventEmitter
()
+
+ get disableButton(): boolean {
+ return !this.form || !(this.valid ?? this.form.valid)
+ }
+}
diff --git a/src/app/modules/shared/components/forms/forms.module.ts b/src/app/modules/shared/components/forms/forms.module.ts
index 2ee4a91..4e1a91c 100644
--- a/src/app/modules/shared/components/forms/forms.module.ts
+++ b/src/app/modules/shared/components/forms/forms.module.ts
@@ -1,28 +1,34 @@
import {NgModule} from '@angular/core'
-import {CreFormActions, CreFormComponent, CreFormContent, CreFormTitle} from './forms'
+import {CreFormActions, CreForm, CreFormContent, CreFormTitle} from './forms'
import {MatCardModule} from '@angular/material/card'
import {CommonModule} from '@angular/common'
import {MatButtonModule} from '@angular/material/button'
import {ReactiveFormsModule} from '@angular/forms'
+import {CreSubmitButton} from './buttons';
+import {CreButtonsModule} from '../buttons/buttons.module';
@NgModule({
declarations: [
- CreFormComponent,
+ CreForm,
CreFormTitle,
CreFormContent,
- CreFormActions
+ CreFormActions,
+ CreSubmitButton
],
exports: [
- CreFormComponent,
+ CreForm,
CreFormTitle,
CreFormContent,
- CreFormActions
+ CreFormActions,
+ CreSubmitButton
],
- imports: [
- MatCardModule,
- CommonModule,
- MatButtonModule,
- ReactiveFormsModule
- ]
+ imports: [
+ MatCardModule,
+ CommonModule,
+ MatButtonModule,
+ ReactiveFormsModule,
+ CreButtonsModule
+ ]
})
-export class CreFormsModule {}
+export class CreFormsModule {
+}
diff --git a/src/app/modules/shared/components/forms/forms.sass b/src/app/modules/shared/components/forms/forms.sass
index fffedc8..1a3fb08 100644
--- a/src/app/modules/shared/components/forms/forms.sass
+++ b/src/app/modules/shared/components/forms/forms.sass
@@ -1,8 +1,12 @@
cre-form
display: block
+ width: max-content
+ min-width: 50rem
+ margin-top: 3rem
mat-card
width: inherit
+ min-width: inherit
cre-form-actions
display: flex
diff --git a/src/app/modules/shared/components/forms/forms.ts b/src/app/modules/shared/components/forms/forms.ts
index 5770d23..7619f15 100644
--- a/src/app/modules/shared/components/forms/forms.ts
+++ b/src/app/modules/shared/components/forms/forms.ts
@@ -1,6 +1,12 @@
import {Component, ContentChild, Directive, Input, OnInit, ViewEncapsulation} from '@angular/core'
import {FormBuilder, FormGroup} from '@angular/forms'
+export interface ICreForm {
+ form: FormGroup
+ valid: boolean
+ invalid: boolean
+}
+
@Directive({
selector: 'cre-form-title'
})
@@ -17,7 +23,6 @@ export class CreFormContent {
selector: 'cre-form-actions'
})
export class CreFormActions {
-
}
@Component({
@@ -26,7 +31,7 @@ export class CreFormActions {
styleUrls: ['forms.sass'],
encapsulation: ViewEncapsulation.None
})
-export class CreFormComponent implements OnInit {
+export class CreForm implements ICreForm, OnInit {
@ContentChild(CreFormActions) formActions: CreFormActions
@Input() formControls: { [key: string]: any }
@@ -42,7 +47,11 @@ export class CreFormComponent implements OnInit {
}
get hasActions(): boolean {
- return this.formActions === true
+ return !!this.formActions
+ }
+
+ get valid(): boolean {
+ return this.form && this.form.valid
}
get invalid(): boolean {
diff --git a/src/app/modules/shared/components/forms/submit-button.html b/src/app/modules/shared/components/forms/submit-button.html
new file mode 100644
index 0000000..8e9289a
--- /dev/null
+++ b/src/app/modules/shared/components/forms/submit-button.html
@@ -0,0 +1 @@
+Enregistrer
diff --git a/src/app/modules/shared/components/header/header.component.ts b/src/app/modules/shared/components/header/header.component.ts
index 94f4563..6d113fd 100644
--- a/src/app/modules/shared/components/header/header.component.ts
+++ b/src/app/modules/shared/components/header/header.component.ts
@@ -66,7 +66,7 @@ export class HeaderComponent extends SubscribingComponent {
}
get logoUrl(): string {
- return environment.apiUrl + "/file?path=images%2Flogo&mediaType=image/png"
+ return environment.apiUrl + "/config/logo"
}
set activeLink(link: string) {
diff --git a/src/app/modules/shared/components/inputs/autocomplete.html b/src/app/modules/shared/components/inputs/autocomplete.html
index bc21b24..760d6f4 100644
--- a/src/app/modules/shared/components/inputs/autocomplete.html
+++ b/src/app/modules/shared/components/inputs/autocomplete.html
@@ -24,7 +24,7 @@
[ngTemplateOutletContext]="{errors: control.errors}">
-
+
{{option}}
diff --git a/src/app/modules/shared/components/inputs/chips-combo-box.html b/src/app/modules/shared/components/inputs/chips-combo-box.html
index 443ff0c..f454ad3 100644
--- a/src/app/modules/shared/components/inputs/chips-combo-box.html
+++ b/src/app/modules/shared/components/inputs/chips-combo-box.html
@@ -30,7 +30,7 @@
-
+
{{option.display ? option.display : option.value}}
diff --git a/src/app/modules/shared/components/inputs/combo-box.html b/src/app/modules/shared/components/inputs/combo-box.html
index 5170f8c..67e0162 100644
--- a/src/app/modules/shared/components/inputs/combo-box.html
+++ b/src/app/modules/shared/components/inputs/combo-box.html
@@ -1,22 +1,23 @@
-
+
{{label}}
-
- Ce champ est requis
+
+ Cette valeur est invalide
+ Ce champ est requis
+ [ngTemplateOutletContext]="{errors: internalControl.errors}">
-
- {{option.value}}
+
+ {{entry.display ? entry.display : entry.value}}
diff --git a/src/app/modules/shared/components/inputs/input.html b/src/app/modules/shared/components/inputs/input.html
index 2bf813e..f58c818 100644
--- a/src/app/modules/shared/components/inputs/input.html
+++ b/src/app/modules/shared/components/inputs/input.html
@@ -5,6 +5,7 @@
@@ -13,6 +14,7 @@
diff --git a/src/app/modules/shared/components/inputs/inputs.module.ts b/src/app/modules/shared/components/inputs/inputs.module.ts
index 1797478..e45c685 100644
--- a/src/app/modules/shared/components/inputs/inputs.module.ts
+++ b/src/app/modules/shared/components/inputs/inputs.module.ts
@@ -4,7 +4,7 @@ import {
CreChipComboBoxComponent,
CreChipInputComponent,
CreComboBoxComponent, CreFileInputComponent,
- CreInputComponent, CrePeriodInputComponent
+ CreInputComponent, CrePeriodInputComponent, CreSelectComponent, CreSliderInputComponent, CreTextareaComponent
} from './inputs'
import {MatInputModule} from '@angular/material/input'
import {MatIconModule} from '@angular/material/icon'
@@ -17,6 +17,7 @@ import {MatChipsModule} from '@angular/material/chips'
import {CreButtonsModule} from '../buttons/buttons.module'
import {MatCheckboxModule} from '@angular/material/checkbox'
import {MatSelectModule} from '@angular/material/select'
+import {MatSliderModule} from '@angular/material/slider';
@NgModule({
declarations: [
@@ -27,7 +28,10 @@ import {MatSelectModule} from '@angular/material/select'
CreChipComboBoxComponent,
CreFileInputComponent,
CreCheckboxInputComponent,
- CrePeriodInputComponent
+ CrePeriodInputComponent,
+ CreSliderInputComponent,
+ CreTextareaComponent,
+ CreSelectComponent
],
imports: [
MatInputModule,
@@ -42,6 +46,7 @@ import {MatSelectModule} from '@angular/material/select'
CreButtonsModule,
MatCheckboxModule,
MatSelectModule,
+ MatSliderModule,
],
exports: [
CreInputComponent,
@@ -51,7 +56,10 @@ import {MatSelectModule} from '@angular/material/select'
CreAutocompleteInputComponent,
CreFileInputComponent,
CreCheckboxInputComponent,
- CrePeriodInputComponent
+ CrePeriodInputComponent,
+ CreSliderInputComponent,
+ CreTextareaComponent,
+ CreSelectComponent
]
})
export class CreInputsModule {
diff --git a/src/app/modules/shared/components/inputs/inputs.ts b/src/app/modules/shared/components/inputs/inputs.ts
index dc7204e..cfca06f 100644
--- a/src/app/modules/shared/components/inputs/inputs.ts
+++ b/src/app/modules/shared/components/inputs/inputs.ts
@@ -1,5 +1,5 @@
import {
- AfterViewInit,
+ AfterViewInit, ChangeDetectorRef,
Component,
ContentChild,
Directive,
@@ -15,14 +15,14 @@ import {
} from '@angular/core'
import {AbstractControl, FormControl, ValidationErrors, ValidatorFn, Validators} from '@angular/forms'
import {COMMA, ENTER} from '@angular/cdk/keycodes'
-import {Observable, Subject} from 'rxjs'
-import {map, takeUntil} from 'rxjs/operators'
+import {isObservable, Observable, Subject} from 'rxjs'
+import {map, startWith, takeUntil} from 'rxjs/operators'
import {MatChipInputEvent} from '@angular/material/chips'
import {MatAutocomplete, MatAutocompleteSelectedEvent} from '@angular/material/autocomplete'
@Directive()
abstract class _CreInputBase {
- @Input() control: AbstractControl | null
+ @Input() control: FormControl | null
@Input() label: string
@Input() value
@Input() disabled = false
@@ -50,16 +50,40 @@ export class CreInputComponent extends _CreInputBase implements AfterViewInit {
@ViewChild('input') input: any
@ContentChild(TemplateRef) errors: TemplateRef
+ fieldRequired = false
+
+ constructor(
+ private cdRef: ChangeDetectorRef
+ ) {
+ super()
+ }
+
ngAfterViewInit() {
const element = this.input.nativeElement
element.type = this.type
element.step = this.step.toString()
element.placeholder = this.placeholder
- element.required = this.required
element.autocomplete = this.autocomplete ? 'on' : 'off'
+
+ this.fieldRequired = this.control ? this.control.validator && this.control.validator({} as AbstractControl)?.required : this.required
+
+ this.cdRef.detectChanges()
}
}
+@Component({
+ selector: 'cre-textarea',
+ templateUrl: 'textarea.html',
+ encapsulation: ViewEncapsulation.None
+})
+export class CreTextareaComponent {
+ @Input() label: string
+ @Input() control: FormControl
+ @Input() cols = 40
+ @Input() rows = 3
+ @Input() placeholder: string | null
+}
+
@Component({
selector: 'cre-autocomplete-input',
templateUrl: 'autocomplete.html',
@@ -70,7 +94,7 @@ export class CreAutocompleteInputComponent {
@Input() label: string
@Input() icon: string
@Input() required = true
- @Input() options: Observable
+ @Input() entries: Observable
@Input() value
@Output() valueChange = new EventEmitter()
@@ -137,9 +161,112 @@ export class CreComboBoxComponent {
@Input() label: string
@Input() icon: string
@Input() required = true
- @Input() options: Observable
@ContentChild(TemplateRef) errors: TemplateRef
+
+ internalControl: FormControl
+ filteredEntries: CreInputEntry[]
+ validValue = false
+
+ private _destroy$ = new Subject()
+ private _entries: CreInputEntry[]
+ private _controlsInitialized = false
+
+ @Input()
+ set entries(entries: Observable | CreInputEntry[]) {
+ if (isObservable(entries)) {
+ (entries as Observable).pipe(takeUntil(this._destroy$))
+ .subscribe({
+ next: entries => {
+ this.initControls(entries)
+ }
+ })
+ } else {
+ this.initControls((entries as CreInputEntry[]))
+ }
+ }
+
+ reloadEntries() {
+ this.filteredEntries = this.filterEntries(this.internalControl.value)
+ }
+
+ private initControls(entries) {
+ this._entries = entries
+ if (this._controlsInitialized) {
+ return
+ }
+
+ this.internalControl = new FormControl({
+ value: null,
+ disabled: false
+ }, Validators.compose([this.control.validator, this.valueValidator()]))
+ this.internalControl.valueChanges
+ .pipe(takeUntil(this._destroy$))
+ .subscribe({
+ next: value => {
+ if (this.internalControl.valid) {
+ this.control.setValue(this.findEntryByValue(value).key)
+ } else {
+ this.control.setValue(null)
+ }
+
+ this.filteredEntries = this.filterEntries(value)
+ }
+ })
+
+ if (this.control.value) {
+ this.internalControl.setValue(this.findEntryByKey(this.control.value)?.value)
+ }
+
+ if (this.control.disabled) {
+ this.internalControl.disable()
+ }
+
+ this.reloadEntries()
+ this._controlsInitialized = true
+ }
+
+ private filterEntries(value: string): CreInputEntry[] {
+ if (!value) {
+ return this._entries
+ }
+
+ const valueLowerCase = value.toLowerCase()
+ return this._entries.filter(entry => {
+ if (entry.display) {
+ return entry.display.toLowerCase().includes(valueLowerCase)
+ } else {
+ return entry.value.toLowerCase().includes(valueLowerCase)
+ }
+ })
+ }
+
+ private findEntryByKey(key: any): CreInputEntry | null {
+ const found = this._entries.filter(e => e.key === key)
+ if (found.length <= 0) {
+ return null
+ }
+ return found[0]
+ }
+
+ private findEntryByValue(value: any): CreInputEntry | null {
+ const found = this._entries.filter(e => e.value === value)
+ if (found.length <= 0) {
+ return null
+ }
+ return found[0]
+ }
+
+ private existsEntryByValue(value: any): boolean {
+ return this._entries && this._entries.filter(o => o.value === value).length > 0
+ }
+
+ private valueValidator(): ValidatorFn {
+ return (control: AbstractControl): ValidationErrors | null => {
+ const valid = this.existsEntryByValue(control.value)
+ return valid ? null : {invalidValue: {value: control.value}}
+ }
+ }
}
@Component({
@@ -148,25 +275,27 @@ export class CreComboBoxComponent {
encapsulation: ViewEncapsulation.None
})
export class CreChipComboBoxComponent extends CreChipInputComponent implements OnDestroy {
- @Input() options: Observable
+ @Input() entries: Observable
@ContentChild(TemplateRef) errors: TemplateRef
@ViewChild('chipInput') chipInput: ElementRef
@ViewChild('auto') matAutocomplete: MatAutocomplete
- filteredOptions: Observable
+ filteredEntries: Observable
- private _options: ComboBoxEntry[]
+ private _entries: CreInputEntry[]
private _destroy$ = new Subject()
ngOnInit() {
super.ngOnInit()
- this.options.pipe(takeUntil(this._destroy$))
- .subscribe({next: options => this._options = options})
+ this.entries.pipe(takeUntil(this._destroy$))
+ .subscribe({
+ next: entries => this._entries = entries
+ })
- this.filteredOptions = this.inputControl.valueChanges.pipe(
- map((query: string | null) => query ? this._filter(query) : this._options.slice())
+ this.filteredEntries = this.inputControl.valueChanges.pipe(
+ map((query: string | null) => query ? this._filter(query) : this._entries.slice())
)
}
@@ -185,13 +314,13 @@ export class CreChipComboBoxComponent extends CreChipInputComponent implements O
return this.selectedValues.length <= 0
}
- private _filter(query: string): ComboBoxEntry[] {
+ private _filter(query: string): CreInputEntry[] {
const filterValue = query.toString().toLowerCase()
- return this._options.filter(option => option.value.toString().toLowerCase().indexOf(filterValue) === 0)
+ return this._entries.filter(e => e.value.toString().toLowerCase().indexOf(filterValue) === 0)
}
private findValueByKey(key: any): any {
- return this._options.filter(o => o.key === key)[0].value
+ return this._entries.filter(e => e.key === key)[0].value
}
}
@@ -294,7 +423,45 @@ export class CrePeriodInputComponent implements OnInit {
}
}
-export class ComboBoxEntry {
+@Component({
+ selector: 'cre-slider-input',
+ templateUrl: 'slider.html'
+})
+export class CreSliderInputComponent {
+ @Input() control: FormControl
+ @Input() label: string
+ @Input() min: number
+ @Input() max: number
+ @Input() step = 1
+ @Input() percents = false
+ @Input() thumbLabel = true
+
+ formatValueForDisplay(value: number): string {
+ return this.percents ? `${value}%` : value.toString()
+ }
+}
+
+@Component({
+ selector: 'cre-select',
+ templateUrl: 'select.html'
+})
+export class CreSelectComponent extends _CreInputBase {
+ @Input() entries: CreInputEntry[] | Observable
+
+ get entriesAreObservable(): boolean {
+ return isObservable(this.entries)
+ }
+
+ get arrayEntries(): CreInputEntry[] {
+ return this.entries as CreInputEntry[]
+ }
+
+ get observableEntries(): Observable {
+ return this.entries as Observable
+ }
+}
+
+export class CreInputEntry {
constructor(
public key: any,
public value: any,
diff --git a/src/app/modules/shared/components/inputs/select.html b/src/app/modules/shared/components/inputs/select.html
new file mode 100644
index 0000000..14a03ee
--- /dev/null
+++ b/src/app/modules/shared/components/inputs/select.html
@@ -0,0 +1,16 @@
+
+ {{label}}
+
+
+
+ {{entry.display || entry.value}}
+
+
+
+
+ {{entry.display || entry.value}}
+
+
+
+
diff --git a/src/app/modules/shared/components/inputs/slider.html b/src/app/modules/shared/components/inputs/slider.html
new file mode 100644
index 0000000..1873422
--- /dev/null
+++ b/src/app/modules/shared/components/inputs/slider.html
@@ -0,0 +1,13 @@
+
diff --git a/src/app/modules/shared/components/inputs/textarea.html b/src/app/modules/shared/components/inputs/textarea.html
new file mode 100644
index 0000000..18653c0
--- /dev/null
+++ b/src/app/modules/shared/components/inputs/textarea.html
@@ -0,0 +1,9 @@
+
+ {{label}}
+
+
diff --git a/src/app/modules/shared/components/subscribing.component.ts b/src/app/modules/shared/components/subscribing.component.ts
index a31dcd4..d003d0a 100644
--- a/src/app/modules/shared/components/subscribing.component.ts
+++ b/src/app/modules/shared/components/subscribing.component.ts
@@ -11,6 +11,8 @@ export abstract class SubscribingComponent implements OnInit, OnDestroy {
protected subscribers$ = []
protected destroy$ = new Subject()
+ loading = false
+
protected constructor(
protected errorService: ErrorService,
protected activatedRoute: ActivatedRoute,
@@ -74,12 +76,14 @@ export abstract class SubscribingComponent implements OnInit, OnDestroy {
protected showLoadingWheel(shouldShowWheel) {
if (shouldShowWheel) {
+ this.loading = true
globalLoadingWheel.show()
}
}
protected hideLoadingWheel(shouldShowWheel) {
if (shouldShowWheel) {
+ this.loading = false
globalLoadingWheel.hide()
}
}
diff --git a/src/app/modules/shared/components/tables/position-buttons.html b/src/app/modules/shared/components/tables/position-buttons.html
new file mode 100644
index 0000000..f953d7b
--- /dev/null
+++ b/src/app/modules/shared/components/tables/position-buttons.html
@@ -0,0 +1,17 @@
+
+
+
+
diff --git a/src/app/modules/shared/components/tables/table.html b/src/app/modules/shared/components/tables/table.html
index 46560ec..9c9a748 100644
--- a/src/app/modules/shared/components/tables/table.html
+++ b/src/app/modules/shared/components/tables/table.html
@@ -1,4 +1,6 @@
-
+
|
diff --git a/src/app/modules/shared/components/tables/tables.module.ts b/src/app/modules/shared/components/tables/tables.module.ts
index 2e9576d..2e5ebc7 100644
--- a/src/app/modules/shared/components/tables/tables.module.ts
+++ b/src/app/modules/shared/components/tables/tables.module.ts
@@ -1,20 +1,28 @@
import {NgModule} from '@angular/core'
import {MatTableModule} from '@angular/material/table'
import {CommonModule} from '@angular/common'
-import {CreInteractiveCell, CreTable} from './tables'
+import {CreInteractiveCell, CrePositionButtons, CreTable} from './tables'
+import {MatButtonModule} from "@angular/material/button";
+import {MatIconModule} from "@angular/material/icon";
+import {MatSortModule} from '@angular/material/sort'
@NgModule({
declarations: [
CreTable,
- CreInteractiveCell
- ],
- imports: [
- MatTableModule,
- CommonModule
+ CreInteractiveCell,
+ CrePositionButtons
],
+ imports: [
+ MatTableModule,
+ CommonModule,
+ MatButtonModule,
+ MatIconModule,
+ MatSortModule
+ ],
exports: [
CreTable,
CreInteractiveCell,
+ CrePositionButtons
]
})
export class CreTablesModule {
diff --git a/src/app/modules/shared/components/tables/tables.ts b/src/app/modules/shared/components/tables/tables.ts
index 59cec5c..a7e7d5d 100644
--- a/src/app/modules/shared/components/tables/tables.ts
+++ b/src/app/modules/shared/components/tables/tables.ts
@@ -3,13 +3,15 @@ import {
Component,
ContentChildren,
Directive,
+ EventEmitter,
HostBinding,
Input,
+ Output,
QueryList,
ViewChild,
ViewEncapsulation
} from '@angular/core'
-import {MatColumnDef, MatHeaderRowDef, MatRowDef, MatTable} from '@angular/material/table'
+import {MatColumnDef, MatHeaderRowDef, MatRowDef, MatTable, MatTableDataSource} from '@angular/material/table'
@Directive({
selector: '[creInteractiveCell]'
@@ -57,17 +59,38 @@ export class CreTable implements AfterContentInit {
@ViewChild(MatTable, {static: true}) table: MatTable
@Input() columns: string[]
- @Input() dataSource: T[]
@Input() interactive = true
+ @Input() filterPredicate: (t: T, filter: string) => boolean = () => true
+ @Input() sortingDataAccessor: (t: T, header: string) => string | number
+
+ @Input() set filter(filter: string) {
+ if (this.dataSource) {
+ this.dataSource.filter = filter
+ }
+ }
+
+ @Input() set data(data: T[]) {
+ this.setupDataSource(data)
+ }
selectedIndex = 0
+ dataSource: MatTableDataSource
+
ngAfterContentInit(): void {
this.columnDefs.forEach(columnDef => this.table.addColumnDef(columnDef))
this.rowDefs.forEach(rowDef => this.table.addRowDef(rowDef))
this.headerRowDefs.forEach(headerRowDef => this.table.addHeaderRowDef(headerRowDef))
}
+ private setupDataSource(data: T[]) {
+ this.dataSource = new MatTableDataSource(data)
+
+ if (this.filterPredicate) {
+ this.dataSource.filterPredicate = (t, filter) => this.filterPredicate(t, filter)
+ }
+ }
+
onRowHover(index: number) {
if (this.interactive) {
this.interactiveCells.forEach(cell => cell.hoverIndex = index)
@@ -80,4 +103,33 @@ export class CreTable implements AfterContentInit {
this.interactiveCells.forEach(cell => cell.selectedIndex = index)
}
}
+
+ renderRows() {
+ this.table.renderRows()
+ }
+}
+
+@Component({
+ selector: 'cre-table-position-buttons',
+ templateUrl: 'position-buttons.html'
+})
+export class CrePositionButtons {
+ @Input() position = 0
+ @Input() min = 0
+ @Input() max: number
+ @Input() hidden = false
+ @Input() disableDecreaseButton = false
+ @Input() disableIncreaseButton = false
+
+ @Output() positionChange = new EventEmitter()
+
+ increasePosition() {
+ this.position += 1
+ this.positionChange.emit(this.position)
+ }
+
+ decreasePosition() {
+ this.position -= 1
+ this.positionChange.emit(this.position)
+ }
}
diff --git a/src/app/modules/shared/model/config.model.ts b/src/app/modules/shared/model/config.model.ts
index 02e4923..70011e1 100644
--- a/src/app/modules/shared/model/config.model.ts
+++ b/src/app/modules/shared/model/config.model.ts
@@ -3,8 +3,8 @@ import {filterMap} from '../utils/map.utils'
export class Config {
static readonly INSTANCE_NAME = 'instance.name'
- static readonly INSTANCE_LOGO_PATH = 'instance.logo.path'
- static readonly INSTANCE_ICON_PATH = 'instance.icon.path'
+ static readonly INSTANCE_LOGO_SET = 'instance.logo.set'
+ static readonly INSTANCE_ICON_SET = 'instance.icon.set'
static readonly INSTANCE_URL = 'instance.url'
static readonly DATABASE_URL = 'database.url'
static readonly DATABASE_USER = 'database.user'
@@ -20,8 +20,8 @@ export class Config {
static readonly OPERATING_SYSTEM = 'env.os'
static readonly IMAGE_CONFIG_KEYS = [
- Config.INSTANCE_LOGO_PATH,
- Config.INSTANCE_ICON_PATH
+ Config.INSTANCE_LOGO_SET,
+ Config.INSTANCE_ICON_SET
]
static readonly PASSWORD_CONFIG_KEYS = [
diff --git a/src/app/modules/shared/model/material.model.ts b/src/app/modules/shared/model/material.model.ts
index 56187fd..681e1f6 100644
--- a/src/app/modules/shared/model/material.model.ts
+++ b/src/app/modules/shared/model/material.model.ts
@@ -1,4 +1,4 @@
-import {MaterialType} from "./materialtype.model";
+import {MaterialType} from './materialtype.model'
import {openPdf} from '../utils/utils'
export class Material {
@@ -15,3 +15,38 @@ export class Material {
export function openSimdut(material: Material) {
openPdf(material.simdutUrl)
}
+
+export const materialComparator = (a: Material, b: Material): number => {
+ const aPrefixName = a.materialType.prefix.toLowerCase()
+ const bPrefixName = b.materialType.prefix.toLowerCase()
+
+ if (aPrefixName < bPrefixName) {
+ return -1
+ } else if (aPrefixName > bPrefixName) {
+ return 1
+ } else {
+ const aName = a.name.toLowerCase()
+ const bName = b.name.toLowerCase()
+
+ if (aName < bName) {
+ return -1
+ } else if (aName > bName) {
+ return 1
+ } else {
+ return 0
+ }
+ }
+}
+
+// Uses private use UTF-8 char to separate the two fields, change if a better method is found
+export const materialFilterFieldSeparator = ''
+
+export function materialMatchesFilter(material: Material, filter: string): boolean {
+ const [materialTypeFilter, materialNameFilter, hideLowQuantity, lowQuantityThreshold] = filter.split(materialFilterFieldSeparator)
+ const materialTypeId = parseInt(materialTypeFilter)
+ const matchesMaterialType = materialTypeId === 1 || materialTypeId == material.materialType.id
+ const matchesMaterialName = !materialNameFilter || material.name.toLowerCase().includes(materialNameFilter.toLowerCase())
+ const matchesLowQuantity = material.inventoryQuantity < parseInt(lowQuantityThreshold)
+
+ return matchesMaterialType && matchesMaterialName && (hideLowQuantity === 'false' || matchesLowQuantity)
+}
diff --git a/src/app/modules/shared/model/recipe.model.ts b/src/app/modules/shared/model/recipe.model.ts
index 2fb9e52..7134171 100644
--- a/src/app/modules/shared/model/recipe.model.ts
+++ b/src/app/modules/shared/model/recipe.model.ts
@@ -1,25 +1,22 @@
import {Material} from './material.model'
-import {LocalDate} from 'js-joda'
import {Company} from './company.model'
import {Group} from './user'
+import {UNIT_MILLILITER} from "../units";
export class Recipe {
- constructor(
- public id: number,
- public name: string,
- public description: string,
- public color: string,
- public gloss: number,
- public sample: number,
- public approbationDate: string,
- public approbationExpired: boolean,
- public remark: string,
- public company: Company,
- public mixes: Mix[],
- public groupsInformation: RecipeGroupInformation[],
- public imagesUrls: string[]
- ) {
- }
+ public id: number
+ public name: string
+ public description: string
+ public color: string
+ public gloss: number
+ public sample: number
+ public approbationDate: string
+ public remark: string
+ public company: Company
+ public mixes: Mix[]
+ public approbationExpired: boolean
+ public groupsInformation: RecipeGroupInformation[]
+ public imagesUrls: string[]
}
export class RecipeGroupInformation {
@@ -57,7 +54,8 @@ export class MixMaterialDto {
public materialId: number,
public quantity: number,
public isPercents: boolean,
- public position: number
+ public position: number,
+ public units: string
) {
}
}
@@ -102,12 +100,13 @@ export function sortRecipeSteps(steps: RecipeStep[]): RecipeStep[] {
return steps.sort((a, b) => a.position - b.position)
}
-export function mixMaterialsAsMixMaterialsDto(mix: Mix): MixMaterialDto[] {
+export function mixMaterialsToMixMaterialsDto(mix: Mix): MixMaterialDto[] {
return sortMixMaterialsDto(mix.mixMaterials.map(m => new MixMaterialDto(
m.material.id,
m.quantity,
m.material.materialType.usePercentages,
- m.position
+ m.position,
+ UNIT_MILLILITER
)))
}
@@ -125,3 +124,8 @@ export function getRecipeLuma(recipe: Recipe): number {
return 0.2126 * r + 0.7152 * g + 0.0722 * b // per ITU-R BT.709
}
+
+export function recipeMatchesFilter(recipe: Recipe, filter: string): boolean {
+ const recipeStr = recipe.company.name + recipe.name + recipe.description + recipe.sample
+ return recipeStr.toLowerCase().indexOf(filter.toLowerCase()) >= 0
+}
diff --git a/src/app/modules/shared/service/config.service.ts b/src/app/modules/shared/service/config.service.ts
index dcfd95d..546ce89 100644
--- a/src/app/modules/shared/service/config.service.ts
+++ b/src/app/modules/shared/service/config.service.ts
@@ -39,11 +39,12 @@ export class ConfigService {
}
setImage(key: string, image: File): Observable {
- const body = new FormData()
- body.append('key', key)
- body.append('image', image)
+ const path = key == Config.INSTANCE_ICON_SET ? 'icon' : 'logo';
- return this.api.put('/config/image', body)
+ const body = new FormData()
+ body.append(path, image)
+
+ return this.api.put(`/config/${path}`, body)
}
restart(): Observable {
diff --git a/src/app/modules/shared/shared.module.ts b/src/app/modules/shared/shared.module.ts
index 05aaf24..be216ae 100644
--- a/src/app/modules/shared/shared.module.ts
+++ b/src/app/modules/shared/shared.module.ts
@@ -37,6 +37,8 @@ import {CreFormsModule} from './components/forms/forms.module'
import {VarDirective} from './directives/var.directive'
import {CreColorPreview} from './components/color-preview/color-preview'
import {CreDialogsModule} from './components/dialogs/dialogs.module'
+import {CreAlertsModule} from './components/alerts/alerts.module';
+import {CreActionBarModule} from './components/action-bar/action-bar.module'
@NgModule({
declarations: [VarDirective, HeaderComponent, UserMenuComponent, LabeledIconComponent, ConfirmBoxComponent, PermissionsListComponent, PermissionsFieldComponent, NavComponent, EntityListComponent, EntityAddComponent, EntityEditComponent, FileButtonComponent, GlobalAlertHandlerComponent, SliderFieldComponent, LoadingWheelComponent, CreColorPreview],
@@ -73,7 +75,8 @@ import {CreDialogsModule} from './components/dialogs/dialogs.module'
CreFormsModule,
VarDirective,
CreColorPreview,
- CreDialogsModule
+ CreDialogsModule,
+ CreAlertsModule
],
imports: [
MatTabsModule,
diff --git a/src/app/modules/shared/units.ts b/src/app/modules/shared/units.ts
index 403f136..adbb475 100644
--- a/src/app/modules/shared/units.ts
+++ b/src/app/modules/shared/units.ts
@@ -25,8 +25,8 @@ export const UNIT_RATIOS = {
}
}
-export function convertMixMaterialQuantity(computedQuantity: MixMaterialDto, from: string, to: string): number {
- return !computedQuantity.isPercents ? convertQuantity(computedQuantity.quantity, from, to) : computedQuantity.quantity
+export function convertMixMaterialQuantity(mixMaterial: MixMaterialDto, to: string): number {
+ return !mixMaterial.isPercents ? convertQuantity(mixMaterial.quantity, mixMaterial.units, to) : mixMaterial.quantity
}
export function convertQuantity(quantity: number, from: string, to: string): number {
diff --git a/src/app/modules/shared/utils/map.utils.ts b/src/app/modules/shared/utils/map.utils.ts
index ba99aec..dd43b65 100644
--- a/src/app/modules/shared/utils/map.utils.ts
+++ b/src/app/modules/shared/utils/map.utils.ts
@@ -1,3 +1,7 @@
+export function anyMap(map: Map, predicate: (key: K, value: V) => boolean): boolean {
+ return filterMap(map, predicate).size > 0
+}
+
export function filterMap(map: Map, predicate: (key: K, value: V) => boolean): Map {
const filteredMap = new Map()
map.forEach((value, key) => {
diff --git a/src/app/modules/shared/utils/utils.ts b/src/app/modules/shared/utils/utils.ts
index bd54ea9..dfa6bf9 100644
--- a/src/app/modules/shared/utils/utils.ts
+++ b/src/app/modules/shared/utils/utils.ts
@@ -1,5 +1,5 @@
/** Returns [value] if it is not null or [or]. */
-import {DateTimeFormatter, LocalDate, LocalDateTime} from 'js-joda'
+import {DateTimeFormatter, LocalDate, LocalDateTime} from '@js-joda/core'
import {TouchUpKit} from '../model/touch-up-kit.model'
import {environment} from '../../../../environments/environment'
@@ -60,3 +60,12 @@ export function readFile(file: File, consumer: (any) => void) {
export function getFileUrl(path: string) {
return `${environment.apiUrl}/file?path=${encodeURIComponent(path)}`
}
+
+export function getConfiguredImageUrl(path: string) {
+ return `${environment.apiUrl}/config/${path}`
+}
+
+export function round(n: number, digits: number): number {
+ const power = Math.pow(10, digits)
+ return Math.round(n * power) / power
+}
diff --git a/src/app/modules/touch-up-kit/components/finish.sass b/src/app/modules/touch-up-kit/components/finish.sass
index 30c9991..7713c99 100644
--- a/src/app/modules/touch-up-kit/components/finish.sass
+++ b/src/app/modules/touch-up-kit/components/finish.sass
@@ -1,4 +1,4 @@
-@import '../../../../custom-theme'
+@import '~src/variables'
.touchupkit-finish-container
display: inline-block
diff --git a/src/app/modules/touch-up-kit/components/finish.ts b/src/app/modules/touch-up-kit/components/finish.ts
index d91f01b..09b2fd7 100644
--- a/src/app/modules/touch-up-kit/components/finish.ts
+++ b/src/app/modules/touch-up-kit/components/finish.ts
@@ -1,6 +1,6 @@
import {Component, Input} from '@angular/core'
import {SubscribingComponent} from '../../shared/components/subscribing.component'
-import {RecipeService} from '../../colors/services/recipe.service'
+import {RecipeService} from '../../recipes/services/recipe.service'
import {ErrorService} from '../../shared/service/error.service'
import {ActivatedRoute, Router} from '@angular/router'
import {Recipe} from '../../shared/model/recipe.model'
diff --git a/src/app/modules/touch-up-kit/components/form.html b/src/app/modules/touch-up-kit/components/form.html
index 999b820..a6dd9eb 100644
--- a/src/app/modules/touch-up-kit/components/form.html
+++ b/src/app/modules/touch-up-kit/components/form.html
@@ -5,7 +5,7 @@
@@ -18,7 +18,7 @@
diff --git a/src/app/modules/touch-up-kit/components/form.ts b/src/app/modules/touch-up-kit/components/form.ts
index 0a77b7f..5fa1a89 100644
--- a/src/app/modules/touch-up-kit/components/form.ts
+++ b/src/app/modules/touch-up-kit/components/form.ts
@@ -1,9 +1,9 @@
import {Component, EventEmitter, Input, Output, ViewChild} from '@angular/core'
-import {chipListRequired, ComboBoxEntry, CreChipComboBoxComponent} from '../../shared/components/inputs/inputs'
-import {CreFormComponent} from '../../shared/components/forms/forms'
+import {chipListRequired, CreInputEntry, CreChipComboBoxComponent} from '../../shared/components/inputs/inputs'
+import {CreForm} from '../../shared/components/forms/forms'
import {TouchUpKitProductEditor} from './product-editor'
import {FormControl, Validators} from '@angular/forms'
-import {RecipeService} from '../../colors/services/recipe.service'
+import {RecipeService} from '../../recipes/services/recipe.service'
import {CompanyService} from '../../company/service/company.service'
import {ErrorService} from '../../shared/service/error.service'
import {ActivatedRoute, Router} from '@angular/router'
@@ -18,14 +18,14 @@ import {map} from 'rxjs/operators'
export class TouchUpKitForm extends SubscribingComponent {
@ViewChild('finishInput') finishInput: CreChipComboBoxComponent
@ViewChild('materialInput') materialInput: CreChipComboBoxComponent
- @ViewChild(CreFormComponent) form: CreFormComponent
+ @ViewChild(CreForm) form: CreForm
@ViewChild(TouchUpKitProductEditor) contentEditor: TouchUpKitProductEditor
@Input() touchUpKit: TouchUpKit | null
controls: any
finish$ = this.recipeService.all.pipe(
- map(recipes => recipes.map(recipe => new ComboBoxEntry(recipe.id, recipe.name, `${recipe.name} - ${recipe.company.name}`)))
+ map(recipes => recipes.map(recipe => new CreInputEntry(recipe.id, recipe.name, `${recipe.name} - ${recipe.company.name}`)))
)
companies$ = this.companyService.all.pipe(
map(companies => companies.map(company => company.name))
diff --git a/src/app/modules/touch-up-kit/pages/details.html b/src/app/modules/touch-up-kit/pages/details.html
index bb5b358..93ebf4c 100644
--- a/src/app/modules/touch-up-kit/pages/details.html
+++ b/src/app/modules/touch-up-kit/pages/details.html
@@ -14,7 +14,7 @@
-
+
Nom |
{{product.name}} |
diff --git a/src/app/modules/touch-up-kit/pages/list.html b/src/app/modules/touch-up-kit/pages/list.html
index 1cb372b..877aa6d 100644
--- a/src/app/modules/touch-up-kit/pages/list.html
+++ b/src/app/modules/touch-up-kit/pages/list.html
@@ -5,7 +5,7 @@
-
+
Project |
{{touchUpKit.project}} |
@@ -57,7 +57,7 @@
Kits de retouche complétés
-
+
Project |
{{touchUpKit.project}} |
diff --git a/src/app/modules/touch-up-kit/pages/touchupkit.ts b/src/app/modules/touch-up-kit/pages/touchupkit.ts
index 57b3ed5..2cdf146 100644
--- a/src/app/modules/touch-up-kit/pages/touchupkit.ts
+++ b/src/app/modules/touch-up-kit/pages/touchupkit.ts
@@ -7,10 +7,10 @@ import {AccountService} from '../../accounts/services/account.service'
import {ErrorService} from '../../shared/service/error.service'
import {ActivatedRoute, Router} from '@angular/router'
import {Permission} from '../../shared/model/user'
-import {RecipeService} from '../../colors/services/recipe.service'
+import {RecipeService} from '../../recipes/services/recipe.service'
import {AppState} from '../../shared/app-state'
import {map} from 'rxjs/operators'
-import {LocalDate, Period} from 'js-joda'
+import {LocalDate, Period} from '@js-joda/core'
import {ConfigService} from '../../shared/service/config.service'
import {Config} from '../../shared/model/config.model'
diff --git a/src/custom-theme.scss b/src/custom-theme.scss
index 5f766ef..cc4d450 100644
--- a/src/custom-theme.scss
+++ b/src/custom-theme.scss
@@ -1,21 +1,21 @@
// Custom Theming for Angular Material
+@use '@angular/material' as mat;
// For more information: https://material.angular.io/guide/theming
-@import '~@angular/material/theming';
// Plus imports for other components in your app.
-$custom-typography: mat-typography-config(
+$custom-typography: mat.define-typography-config(
$font-family: "Open Sans"
);
// Include the common styles for Angular Material. We include this here so that you only
// have to load a single css file for Angular Material in your app.
// Be sure that you only ever include this mixin once!
-@include mat-core($custom-typography);
+@include mat.core($custom-typography);
// Define the palettes for your theme using the Material Design palettes available in palette.sass
// (imported above). For each palette, you can optionally specify a default, lighter, and darker
// hue. Available color palettes: https://material.io/design/color/
-$theme-primary: mat-palette((
+$theme-primary: mat.define-palette((
50 : #e0e0e0,
100 : #b3b3b3,
200 : #808080,
@@ -46,7 +46,7 @@ $theme-primary: mat-palette((
A400 : #ffffff,
A700 : #ffffff,
)));
-$theme-accent: mat-palette((
+$theme-accent: mat.define-palette((
50 : #edf9e0,
100 : #d1f0b3,
200 : #b3e680,
@@ -78,7 +78,7 @@ $theme-accent: mat-palette((
A700 : #000000,
)
));
-$theme-warning: mat-palette((
+$theme-warning: mat.define-palette((
50 : #fff8e4,
100 : #feefbd,
200 : #fee491,
@@ -112,15 +112,15 @@ $theme-warning: mat-palette((
));
// The warn palette is optional (defaults to red).
-$theme-error: mat-palette($mat-red);
+$theme-error: mat.define-palette(mat.$red-palette);
// Create the theme object (a Sass map containing all of the palettes).
-$color-recipes-explorer-frontend-theme: mat-light-theme($theme-primary, $theme-accent, $theme-error);
+$color-recipes-explorer-frontend-theme: mat.define-light-theme($theme-primary, $theme-accent, $theme-error);
// Include theme styles for core and each component used in your app.
// Alternatively, you can import and @include the theme mixins for each component
// that you are using.
-@include angular-material-theme($color-recipes-explorer-frontend-theme);
+@include mat.all-component-themes($color-recipes-explorer-frontend-theme);
html, body {
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 07d5091..8a40323 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -14,4 +14,4 @@ export const environment = {
* This import should be commented out in production mode because it will have a negative impact
* on performance if an error is thrown.
*/
-// import 'zone.js/dist/zone-error'; // Included with Angular CLI.
+// import 'zone.js/plugins/zone-error'; // Included with Angular CLI.
diff --git a/src/polyfills.ts b/src/polyfills.ts
index 03711e5..dcd18ea 100644
--- a/src/polyfills.ts
+++ b/src/polyfills.ts
@@ -18,16 +18,6 @@
* BROWSER POLYFILLS
*/
-/** IE10 and IE11 requires the following for NgClass support on SVG elements */
-// import 'classlist.js'; // Run `npm install --save classlist.js`.
-
-/**
- * Web Animations `@angular/platform-browser/animations`
- * Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
- * Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
- */
-// import 'web-animations-js'; // Run `npm install --save web-animations-js`.
-
/**
* By default, zone.js will patch all possible macroTask and DomEvents
* user can disable parts of macroTask/DomEvents patch by setting following flags
@@ -55,7 +45,7 @@
/***************************************************************************************************
* Zone JS is required by default for Angular itself.
*/
-import 'zone.js/dist/zone'; // Included with Angular CLI.
+import 'zone.js'; // Included with Angular CLI.
/***************************************************************************************************
diff --git a/src/test.ts b/src/test.ts
index 50193eb..4bf4afb 100644
--- a/src/test.ts
+++ b/src/test.ts
@@ -1,6 +1,6 @@
// This file is required by karma.conf.js and loads recursively all the .spec and framework files
-import 'zone.js/dist/zone-testing';
+import 'zone.js/testing';
import { getTestBed } from '@angular/core/testing';
import {
BrowserDynamicTestingModule,
@@ -17,7 +17,9 @@ declare const require: {
// First, initialize the Angular testing environment.
getTestBed().initTestEnvironment(
BrowserDynamicTestingModule,
- platformBrowserDynamicTesting()
+ platformBrowserDynamicTesting(), {
+ teardown: { destroyAfterEach: false }
+}
);
// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/);