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

[HIMA-328] updated library @isa/remission and made the necessary changes in the code to support the changes in the library

Browse Source
This commit is contained in:
Eraldo Hasanaj
2019-11-22 09:57:15 +01:00
parent 4a89b49b1e
commit 8ac5cb9147
8 changed files with 82 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/sales/src/app/modules/remission/components/remission-list/remission-list.component.ts
View File

@@ -20,7 +20,7 @@ export class RemissionListComponent implements OnInit, OnDestroy {
@Input() remissionProcess: RemissionProcess;
@Output() scrolled = new EventEmitter<number>();
@Output() stopScroll = new EventEmitter<boolean>();
remissionProcesessId: string;
remissionProcesessId: number;
ds: RemissionListDataSource;
destroy$ = new Subject();
subscribedToProducts = false;

2
apps/sales/src/app/modules/remission/components/remission-list/remission-list.datasource.ts
View File

@@ -24,7 +24,7 @@ export class RemissionListDataSource extends DataSource<RemissionProduct | undef
private search: RemissionService,
private helper: RemissionHelperService,
private store: Store,
private remissionProcessId: string
private remissionProcessId: number
) {
super();
}

4
apps/sales/src/app/modules/remission/components/remission-shipping-document-card/remission-shipping-document-card.component.ts
View File

@@ -9,8 +9,8 @@ import { RemissionHelperService } from '../../services/remission-helper.service'
})
export class RemissionShippingDocumentCardComponent implements OnInit {
@Input() product: RemissionProduct;
@Input() remissionProcessId: string;
@Input() shippingDocumentId: string;
@Input() remissionProcessId: number;
@Input() shippingDocumentId: number;
constructor(private remissionService: RemissionService, private remissionHelper: RemissionHelperService) {}

8
apps/sales/src/app/modules/remission/components/remission-shipping-document/remission-shipping-document.component.ts
View File

@@ -13,9 +13,9 @@ import { Observable, Subject } from 'rxjs';
styleUrls: ['./remission-shipping-document.component.scss']
})
export class RemissionShippingDocumentComponent implements OnInit, OnDestroy {
@Input() remissionProcessId: string;
@Input() remissionProcessId: number;
@Input() selectedSupplier: string;
@Input() shippingDocumentId: string;
@Input() shippingDocumentId: number;
@Output() activeShippingDocument = new EventEmitter<boolean>();
@Select(RemissionSelectors.getRemissionShippingDocumentstatus) shippingDocumentStatus$: Observable<boolean>;
destroy$ = new Subject();
@@ -74,8 +74,8 @@ export class RemissionShippingDocumentComponent implements OnInit, OnDestroy {
createShippingDocument$(): Observable<ShippingDocument> {
console.log('shipping document created');
let params: {
remissionProcessId: string;
shippingDocumentId?: string;
remissionProcessId: number;
shippingDocumentId?: number;
};
if (this.shippingDocumentId) {

4
apps/sales/src/app/modules/remission/pages/remission-list-started/remission-list-started.component.ts
View File

@@ -57,7 +57,7 @@ export class RemissionListStartedComponent implements OnInit, OnDestroy {
listLoaded = false;
disabledCompleteRemissionButton = true;
shippingDocumentCreationPage;
shippingDocumentId: string;
shippingDocumentId: number;
loaded = false;
isIPad = false;
stopScrollStatus = false;
@@ -387,7 +387,7 @@ export class RemissionListStartedComponent implements OnInit, OnDestroy {
}
shippingDocumentScanned(shippingDocumentId: string) {
this.shippingDocumentId = shippingDocumentId;
this.shippingDocumentId = +shippingDocumentId;
this.shippingDocumentCreationPage = false;
this.subscriptions();
}

4
apps/sales/src/app/modules/remission/services/remission-helper.service.ts
View File

@@ -11,7 +11,7 @@ export class RemissionHelperService {
filteOptionsDeleteEvents$ = new Subject<FilterOption>();
filtersClearedEvent$ = new Subject();
closeFilters$ = new Subject();
loadRemissionListProducts$ = new BehaviorSubject<string>(null);
loadRemissionListProducts$ = new BehaviorSubject<number>(null);
filtersUpdated$ = new Subject<UpdateFilter>();
reApplyFilters$ = new BehaviorSubject<RemissionResourceType>(null);
remissionListHits$ = new BehaviorSubject<number>(null);
@@ -25,7 +25,7 @@ export class RemissionHelperService {
public closeFilters = () => this.closeFilters$.next();
public updateFilters = (changes: UpdateFilter) => this.filtersUpdated$.next(changes);
public reApplyFilters = (source: RemissionResourceType) => this.reApplyFilters$.next(source);
public loadRemissionListProducts = (remissionProcessId: string) => this.loadRemissionListProducts$.next(remissionProcessId);
public loadRemissionListProducts = (remissionProcessId: number) => this.loadRemissionListProducts$.next(remissionProcessId);
public setRemissionListHits = (hits: number) => this.remissionListHits$.next(hits);
public deleteRemissionListItem = (remissionProduct: RemissionProduct) => this.deleteRemissionListItem$.next(remissionProduct);
public addRemissionListItem = (remissionProduct: RemissionProduct) => this.addRemissionListItem$.next(remissionProduct);

72
package-lock.json generated
View File

@@ -1101,15 +1101,81 @@
}
},
"@isa/remission": {
"version": "0.1.4",
"resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@isa/remission/-/remission-0.1.4.tgz",
"integrity": "sha1-jFD3OM74V7E+8UKhAwao4IE3XMQ=",
"version": "0.1.6",
"resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@isa/remission/-/remission-0.1.6.tgz",
"integrity": "sha1-X3Z/z9FKcOdGpLcXxB55W//vxJI=",
"requires": {
"@isa/catsearch-api": "0.0.21",
"@isa/print-api": "0.0.21",
"@isa/remi-api": "0.0.21",
"deep-equal": "^1.1.0",
"tslib": "^1.9.0",
"uuid": "^3.3.3"
},
"dependencies": {
"@cmf/catalog-api": {
"version": "0.1.8",
"resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@cmf/catalog-api/-/catalog-api-0.1.8.tgz",
"integrity": "sha1-U0sNLVzptjXl1PFY3HuzEGR/66g=",
"requires": {
"tslib": "^1.9.0"
}
},
"@cmf/core": {
"version": "0.1.8",
"resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@cmf/core/-/core-0.1.8.tgz",
"integrity": "sha1-VUspqHh0s0ZD83MNkEJ0Wth58bk=",
"requires": {
"tslib": "^1.9.0"
}
},
"@cmf/inventory-api": {
"version": "0.1.8",
"resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@cmf/inventory-api/-/inventory-api-0.1.8.tgz",
"integrity": "sha1-zQ3Kr7NfZEq/MsHjyx7rJEeVkTM=",
"requires": {
"tslib": "^1.9.0"
}
},
"@cmf/trade-api": {
"version": "0.1.8",
"resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@cmf/trade-api/-/trade-api-0.1.8.tgz",
"integrity": "sha1-T2JjckMZL3t62i32oqOWm2YbF9I=",
"requires": {
"tslib": "^1.9.0"
}
},
"@isa/catsearch-api": {
"version": "0.0.21",
"resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@isa/catsearch-api/-/catsearch-api-0.0.21.tgz",
"integrity": "sha1-gXx9f4fQI28BoPx71k/t1KPEvSk=",
"requires": {
"@cmf/catalog-api": "0.1.8",
"@cmf/core": "0.1.8",
"@cmf/trade-api": "0.1.8",
"tslib": "^1.9.0"
}
},
"@isa/print-api": {
"version": "0.0.21",
"resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@isa/print-api/-/print-api-0.0.21.tgz",
"integrity": "sha1-8+5VXRjPtKSWoABzxpx+2uuZ0eU=",
"requires": {
"@cmf/core": "0.1.8",
"tslib": "^1.9.0"
}
},
"@isa/remi-api": {
"version": "0.0.21",
"resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@isa/remi-api/-/remi-api-0.0.21.tgz",
"integrity": "sha1-s5fJ0VccP1plbKo/XJcf/aFgt/A=",
"requires": {
"@cmf/core": "0.1.8",
"@cmf/inventory-api": "0.1.8",
"@cmf/trade-api": "0.1.8",
"tslib": "^1.9.0"
}
},
"deep-equal": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",

2
package.json
View File

@@ -34,7 +34,7 @@
"@isa/catsearch-api": "0.0.16",
"@isa/print-api": "0.0.16",
"@isa/remi-api": "0.0.16",
"@isa/remission": "^0.1.4",
"@isa/remission": "^0.1.6",
"@ngxs/store": "^3.4.1",
"@types/faker": "^4.1.5",
"@zxing/ngx-scanner": "^1.3.0",