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-1062 change the text on the confirmation view, remove silent refresh from the auth service and update the remission library

Browse Source
This commit is contained in:
Adrian Toczydlowski
2020-02-10 13:03:27 +01:00
parent 9f0633e580
commit 0958d6c774
4 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
apps/sales/src/app/modules/remission/pages/remission-finish/remission-finish.component.ts
View File

@@ -54,7 +54,7 @@ export class RemissionFinishComponent implements OnInit, OnDestroy {
title = {
0: 'Wannennummer scannen',
1: 'Wanne abgeschlossen',
2: `${SUPPLIER_PLACEHOLDER} Warenbegleitschein gedruckt`
2: ``
};
isSafari = false;
isNative = false;
@@ -64,7 +64,17 @@ export class RemissionFinishComponent implements OnInit, OnDestroy {
0: 'Scannen Sie die Wannennummer um den Warenbegleitschein abzuschließen.',
// tslint:disable-next-line: max-line-length
1: 'Der Warenbegleitschein wird nach Abschluss der Remission versendet. Zum Öffnen eines neuen Warenbegleitscheins setzen Sie die Remission fort.',
2: `Die Warenbegleitscheine für ${SUPPLIER_PLACEHOLDER} werden gedruckt. Bitte an der Wanne befestigen.`
2: ''
};
private finishPocessTitles = {
1: `${SUPPLIER_PLACEHOLDER} Warenbegleitschein gedruckt`,
2: `Warenbegleitschein versendet`
};
private finishPocessSubTitles = {
1: `Die Warenbegleitscheine für ${SUPPLIER_PLACEHOLDER} werden gedruckt. Bitte an der Wanne befestigen.`,
2: `Der Warenbegleitschein wurde digital an ${SUPPLIER_PLACEHOLDER} versendet.`
};
constructor(
@@ -183,11 +193,11 @@ export class RemissionFinishComponent implements OnInit, OnDestroy {
// tslint:disable-next-line: max-line-length
'Der Warenbegleitschein wird nach Abschluss der Remission gedruckt. Zum Öffnen eines neuen Warenbegleitscheins setzen Sie die Remission fort.';
}
this.title[RemissionFinishingProcessStatus.finished] = this.title[RemissionFinishingProcessStatus.finished].replace(
this.title[RemissionFinishingProcessStatus.finished] = this.finishPocessTitles[this.supplier.id].replace(
SUPPLIER_PLACEHOLDER,
selectedSupplierName
);
this.subTitle[RemissionFinishingProcessStatus.finished] = this.subTitle[RemissionFinishingProcessStatus.finished].replace(
this.subTitle[RemissionFinishingProcessStatus.finished] = this.finishPocessSubTitles[this.supplier.id].replace(
SUPPLIER_PLACEHOLDER,
selectedSupplierName
);

6
libs/sso/src/lib/sso.service.ts
View File

@@ -7,15 +7,11 @@ import { isNullOrUndefined } from 'util';
providedIn: 'root'
})
export class SsoService {
constructor(
private oauthService: OAuthService,
private externalService: SsoInterface
) {}
constructor(private oauthService: OAuthService, private externalService: SsoInterface) {}
public registerAuthentication() {
this.oauthService.configure(this.externalService.getConfigurations());
this.oauthService.tokenValidationHandler = new JwksValidationHandler();
this.oauthService.setupAutomaticSilentRefresh();
return this.oauthService.loadDiscoveryDocumentAndTryLogin().then(_ => {
const hasIdToken = !!this.getIdToken();

6
package-lock.json generated
View File

@@ -1095,9 +1095,9 @@
}
},
"@isa/remission": {
"version": "0.2.27",
"resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@isa/remission/-/remission-0.2.27.tgz",
"integrity": "sha1-u4UV7p006cazLFGN35NvXXu1x+Q=",
"version": "0.2.28",
"resolved": "https://pkgs.dev.azure.com/hugendubel/_packaging/hugendubel/npm/registry/@isa/remission/-/remission-0.2.28.tgz",
"integrity": "sha1-BCHwsI1cSB6C3Csz2gYubktoOw0=",
"requires": {
"tslib": "^1.9.0"
}

2
package.json
View File

@@ -37,7 +37,7 @@
"@isa/catsearch-api": "^0.0.51",
"@isa/print-api": "0.0.51",
"@isa/remi-api": "^0.0.51",
"@isa/remission": "^0.2.27",
"@isa/remission": "^0.2.28",
"@ng-idle/core": "^8.0.0-beta.4",
"@ng-idle/keepalive": "^8.0.0-beta.4",
"@ngxs/store": "^3.4.1",