diff --git a/src/app/modules/colors/components/mix-table/mix-table.component.html b/src/app/modules/colors/components/mix-table/mix-table.component.html index b5e104d..a0e1034 100644 --- a/src/app/modules/colors/components/mix-table/mix-table.component.html +++ b/src/app/modules/colors/components/mix-table/mix-table.component.html @@ -15,7 +15,7 @@
- +
@@ -99,7 +99,7 @@ + *ngIf="(!hoveredMixMaterial && i === 0) || hoveredMixMaterial === mixMaterial"> - + + + - + diff --git a/src/app/modules/colors/components/step-table/step-table.component.ts b/src/app/modules/colors/components/step-table/step-table.component.ts index 4038674..f5e3a7e 100644 --- a/src/app/modules/colors/components/step-table/step-table.component.ts +++ b/src/app/modules/colors/components/step-table/step-table.component.ts @@ -13,6 +13,8 @@ export class StepTableComponent { @Input() steps: RecipeStep[] + hoveredStep : RecipeStep | null + addStep() { this.steps.push({id: null, message: ""}) this.stepTable.renderRows() diff --git a/src/app/modules/colors/pages/edit/edit.component.ts b/src/app/modules/colors/pages/edit/edit.component.ts index d61827c..c4f8a20 100644 --- a/src/app/modules/colors/pages/edit/edit.component.ts +++ b/src/app/modules/colors/pages/edit/edit.component.ts @@ -1,5 +1,5 @@ import {Component, ViewChild} from '@angular/core' -import {ErrorHandlingComponent, SubscribingComponent} from '../../../shared/components/subscribing.component' +import {ErrorHandlingComponent} from '../../../shared/components/subscribing.component' import {Recipe} from '../../../shared/model/recipe.model' import {RecipeService} from '../../services/recipe.service' import {ActivatedRoute, Router} from '@angular/router' @@ -10,7 +10,7 @@ import {AccountService} from '../../../accounts/services/account.service' import {EmployeePermission} from '../../../shared/model/employee' import {EntityEditComponent} from '../../../shared/components/entity-edit/entity-edit.component' import {ImagesEditorComponent} from '../../components/images-editor/images-editor.component' -import {ErrorHandler, ErrorModel, ErrorService} from '../../../shared/service/error.service' +import {ErrorModel, ErrorService} from '../../../shared/service/error.service' import {AlertService} from '../../../shared/service/alert.service' @Component({ diff --git a/src/app/modules/colors/pages/explore/explore.component.html b/src/app/modules/colors/pages/explore/explore.component.html index 89b077b..3cb2ce7 100644 --- a/src/app/modules/colors/pages/explore/explore.component.html +++ b/src/app/modules/colors/pages/explore/explore.component.html @@ -5,11 +5,11 @@
- + - +
diff --git a/src/app/modules/colors/pages/explore/explore.component.ts b/src/app/modules/colors/pages/explore/explore.component.ts index 65f7f28..a71ed01 100644 --- a/src/app/modules/colors/pages/explore/explore.component.ts +++ b/src/app/modules/colors/pages/explore/explore.component.ts @@ -7,7 +7,6 @@ import {Observable, Subject} from 'rxjs' import {ErrorModel, ErrorService} from '../../../shared/service/error.service' import {AlertService} from '../../../shared/service/alert.service' import {GlobalAlertHandlerComponent} from '../../../shared/components/global-alert-handler/global-alert-handler.component' -import {globalLoadingWheel} from '../../../shared/components/loading-wheel/loading-wheel.component' @Component({ selector: 'cre-explore', diff --git a/src/app/modules/shared/components/entity-list/entity-list.component.html b/src/app/modules/shared/components/entity-list/entity-list.component.html index e0ac245..d5acfd2 100644 --- a/src/app/modules/shared/components/entity-list/entity-list.component.html +++ b/src/app/modules/shared/components/entity-list/entity-list.component.html @@ -20,18 +20,20 @@ - - + + + + - + diff --git a/src/app/modules/shared/components/entity-list/entity-list.component.ts b/src/app/modules/shared/components/entity-list/entity-list.component.ts index 752a1cb..2f3d7a8 100644 --- a/src/app/modules/shared/components/entity-list/entity-list.component.ts +++ b/src/app/modules/shared/components/entity-list/entity-list.component.ts @@ -16,6 +16,8 @@ export class EntityListComponent { @Input() addLink: string @Input() addPermission: EmployeePermission + hoveredEntity: T | null + constructor( private accountService: AccountService ) {