sxhundred/ISA-Frontend
1
0
Fork 0
mirror of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend synced 2025-12-31 09:37:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merged PR 1187: #3033 Fix TK Article List Search Routing and changed EAN Copy Seperator

Browse Source 
#3033 Fix TK Article List Search Routing and changed EAN Copy Seperator
This commit is contained in:
Nino Righi
2022-04-20 14:24:01 +00:00
committed by Andreas Schickinger
parent 810a7d0a8f
commit c4ed8d0648
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/page/task-calendar/src/lib/components/task-info/task-info.component.ts
View File

@@ -175,7 +175,7 @@ export class TaskInfoComponent implements OnChanges {
}
copyArticleList() {
const eanString = this.info.articles.map((article) => article.data.ean).join(',');
const eanString = this.info.articles.map((article) => article.data.ean).join(';');
this.clipboard.copy(eanString);
}

15
apps/page/task-calendar/src/lib/modals/article-list/article-list-modal.component.ts
View File

@@ -1,6 +1,7 @@
import { Clipboard } from '@angular/cdk/clipboard';
import { ChangeDetectionStrategy, Component, ElementRef, ViewChild } from '@angular/core';
import { ChangeDetectionStrategy, Component } from '@angular/core';
import { Router } from '@angular/router';
import { ApplicationService } from '@core/application';
import { DomainPrinterService } from '@domain/printer';
import { DomainTaskCalendarService } from '@domain/task-calendar';
import { PrintModalComponent, PrintModalData } from '@modal/printer';
@@ -24,7 +25,8 @@ export class ArticleListModalComponent {
private clipboard: Clipboard,
private domainTaskCalendarService: DomainTaskCalendarService,
private domainPrinterService: DomainPrinterService,
private uiModal: UiModalService
private uiModal: UiModalService,
private _applicationService: ApplicationService
) {}
close() {
@@ -49,14 +51,19 @@ export class ArticleListModalComponent {
async eanCopy() {
const articles = await this.articles$.toPromise();
const eanString = articles.map((article: ArticleDTO) => article.ean).join(',');
const eanString = articles.map((article: ArticleDTO) => article.ean).join(';');
this.clipboard.copy(eanString);
}
async articleSearch() {
const articles = await this.articles$.toPromise();
const taskCalendarSearch: string = articles.map((article: ArticleDTO) => article.ean).join(';');
let lastActivatedProcessId = (
await this._applicationService.getLastActivatedProcessWithSectionAndType$('customer', 'cart').pipe(first()).toPromise()
)?.id;
this.modalRef.close('closeAll');
this.router.navigate(['/kunde', 'product', 'search', 'results'], { queryParams: { main_qs: taskCalendarSearch } });
this.router.navigate(['/kunde', String(lastActivatedProcessId), 'product', 'search', 'results'], {
queryParams: { main_qs: taskCalendarSearch },
});
}
}