sxhundred/ISA-Frontend
1
0
Fork 0
mirror of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend synced 2025-12-28 22:42:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

#3354 Filialauswahl Tablet design anpassung

Browse Source
This commit is contained in:
Lorenz Hilpert
2023-02-01 17:27:33 +01:00
parent 66bf91e177
commit e2bc284091
4 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/page/catalog/src/lib/page-catalog.component.html
View File

@@ -1,5 +1,4 @@
<shared-breadcrumb class="my-4" [key]="activatedProcessId$ | async" [tags]="['catalog']">
<shared-branch-selector *ngIf="showBranchSelector" [value]="selectedBranch$ | async" (valueChange)="patchProcessData($event)">
</shared-branch-selector>
<shared-branch-selector [value]="selectedBranch$ | async" (valueChange)="patchProcessData($event)"> </shared-branch-selector>
</shared-breadcrumb>
<router-outlet></router-outlet>

14
apps/page/catalog/src/lib/page-catalog.component.scss
View File

@@ -15,7 +15,7 @@ shared-branch-selector.shared-branch-selector-opend {
}
::ng-deep page-catalog shared-branch-selector .shared-branch-selector-input-container {
@apply rounded-r-[5px];
@apply rounded-[5px];
}
::ng-deep page-catalog shared-branch-selector .shared-branch-selector-input-container .shared-branch-selector-input-icon {
@@ -30,6 +30,18 @@ shared-branch-selector.shared-branch-selector-opend {
@apply pl-0 border-l-0;
}
::ng-deep .tablet page-catalog shared-branch-selector.shared-branch-selector-opend {
@apply w-[736px];
}
::ng-deep .tablet page-catalog shared-breadcrumb:focus-within .shared-breadcrumb__suffix {
@apply rounded-[5px];
}
::ng-deep .tablet page-catalog shared-breadcrumb:focus-within .shared-breadcrumb__suffix::before {
@apply hidden;
}
::ng-deep page-catalog shared-branch-selector.shared-branch-selector-opend .shared-branch-selector-input-container {
@apply rounded-br-none;
}

5
apps/page/catalog/src/lib/page-catalog.component.ts
View File

@@ -1,6 +1,5 @@
import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
import { ApplicationService } from '@core/application';
import { EnvironmentService } from '@core/environment';
import { BranchDTO } from '@swagger/checkout';
import { UiErrorModalComponent, UiModalService } from '@ui/modal';
import { Observable } from 'rxjs';
@@ -17,9 +16,7 @@ export class PageCatalogComponent implements OnInit {
activatedProcessId$: Observable<string>;
selectedBranch$: Observable<BranchDTO>;
showBranchSelector = this.environment.isDesktop();
constructor(public application: ApplicationService, private _uiModal: UiModalService, private environment: EnvironmentService) {}
constructor(public application: ApplicationService, private _uiModal: UiModalService) {}
ngOnInit() {
this.activatedProcessId$ = this.application.activatedProcessId$.pipe(map((processId) => String(processId)));

1
apps/shared/components/branch-selector/src/lib/branch-selector.component.ts
View File

@@ -38,6 +38,7 @@ import { BranchSelectorStore } from './branch-selector.store';
],
imports: [CommonModule, FormsModule, UiIconModule, UiAutocompleteModule, UiCommonModule],
standalone: true,
exportAs: 'sharedBranchSelector',
})
export class BranchSelectorComponent implements OnInit, AfterViewInit, ControlValueAccessor {
@ViewChild(UiAutocompleteComponent, { read: UiAutocompleteComponent, static: false })