Skip to content

Commit ed2ebf2

Browse files
authored
Merge branch 'release/6.2.2' into NAE-1717
2 parents 2fdbecb + 35c1c9e commit ed2ebf2

File tree

5 files changed

+29
-15
lines changed

5 files changed

+29
-15
lines changed

projects/netgrif-components-core/src/assets/i18n/de.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@
8787
"errThird": "Sie müssen eine Farbe auswählen.",
8888
"noNets": "Es gibt keine erlaubte Netze",
8989
"createCase": "Neuen Fall würde erfolgreich erzeugt",
90-
"defaultCaseName": "mit einem Standardfallnamen"
90+
"defaultCaseName": "mit einem Standardfallnamen",
91+
"createCaseError": "Neuer Fall wurde erstellt, aber beim Ausführen von Aktionen ist ein Fehler aufgetreten"
9192
},
9293
"user": {
9394
"assign": "Benutzer zuweisen",

projects/netgrif-components-core/src/assets/i18n/en.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@
8787
"errThird": "Color is required.",
8888
"noNets": "No allowed Nets",
8989
"createCase": "Successful create new case",
90-
"defaultCaseName": "with default case name"
90+
"defaultCaseName": "with default case name",
91+
"createCaseError": "A new case was created, but an error occurred while executing actions"
9192
},
9293
"user": {
9394
"assign": "User Assign",

projects/netgrif-components-core/src/assets/i18n/sk.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@
8787
"errThird": "Farba je povinné pole.",
8888
"noNets": "Žiadne povolené siete",
8989
"createCase": "Úspešne vytvorený nový prípad",
90-
"defaultCaseName": "s prednastaveným názvom prípadu"
90+
"defaultCaseName": "s prednastaveným názvom prípadu",
91+
"createCaseError": "Nový prípad vytvorený, nastala však chyba pri vykonávaní akcií"
9192
},
9293
"user": {
9394
"assign": "Priradiť používateľa",

projects/netgrif-components-core/src/lib/data-fields/number-field/currency-number-field/abstract-currency-number-field.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ export abstract class AbstractCurrencyNumberFieldComponent extends AbstractNumbe
1313
fieldType: string;
1414
public readonly NUMBER_TYPE = 'number';
1515
public readonly TEXT_TYPE = 'text';
16+
public readonly WHITESPACE = ' ';
1617

1718
protected constructor(protected _currencyPipe: CurrencyPipe, translateService: TranslateService) {
1819
super(translateService);
@@ -24,7 +25,7 @@ export abstract class AbstractCurrencyNumberFieldComponent extends AbstractNumbe
2425
this.numberField.valueChanges().subscribe(value => {
2526
if (value !== undefined) {
2627
if (this.fieldType === this.TEXT_TYPE) {
27-
this.transformedValue = this.transformCurrency(value.toString());
28+
this.transformedValue = this.transformCurrency(value.toString()) + this.WHITESPACE;
2829
}
2930
} else {
3031
this.transformedValue = '';

projects/netgrif-components-core/src/lib/side-menu/content-components/new-case/abstract-new-case.component.ts

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -148,17 +148,27 @@ export abstract class AbstractNewCaseComponent implements OnDestroy {
148148
this._caseResourceService.createCase(newCase)
149149
.subscribe(
150150
(response: EventOutcomeMessageResource) => {
151-
this._snackBarService.openSuccessSnackBar(response.outcome.message === undefined
152-
? this._translate.instant('side-menu.new-case.createCase') + ' ' + newCase.title
153-
: response.outcome.message);
154-
this._sideMenuControl.close({
155-
opened: false,
156-
message: response.outcome.message === undefined
157-
? 'Confirm new case setup'
158-
: response.outcome.message
159-
,
160-
data: (response.outcome as CreateCaseEventOutcome).aCase
161-
});
151+
if (!!response.outcome) {
152+
this._snackBarService.openSuccessSnackBar(response.outcome.message === undefined
153+
? this._translate.instant('side-menu.new-case.createCase') + ' ' + newCase.title
154+
: response.outcome.message);
155+
this._sideMenuControl.close({
156+
opened: false,
157+
message: response.outcome.message === undefined
158+
? 'Confirm new case setup'
159+
: response.outcome.message
160+
,
161+
data: (response.outcome as CreateCaseEventOutcome).aCase
162+
});
163+
} else if (!!response.error) {
164+
this._snackBarService.openWarningSnackBar(this._translate.instant('side-menu.new-case.createCaseError') + ' ' + newCase.title);
165+
this._sideMenuControl.close({
166+
opened: false,
167+
message: response.error === undefined
168+
? 'Confirm new case setup'
169+
: response.error
170+
});
171+
}
162172
},
163173
error => this._snackBarService.openErrorSnackBar(error.message ? error.message : error)
164174
);

0 commit comments

Comments
 (0)