@@ -127,8 +148,8 @@
@if (expanded && entries.total && entries.filter && entries.filter.username == entry[0]) {
-
+
}
diff --git a/frontend/src/app/pages/management/management.page.ts b/frontend/src/app/pages/management/management.page.ts
index ce2691c..d9a0129 100644
--- a/frontend/src/app/pages/management/management.page.ts
+++ b/frontend/src/app/pages/management/management.page.ts
@@ -22,7 +22,7 @@ export class PageManagement implements OnInit {
descending: boolean = false;
filterOpen: boolean = true;
- columns: string[] = ['username', 'price', 'timeInvestment', 'menu'];
+ columns: string[] = ['username', 'price', 'timeInvestment', 'giftcardPrice', 'menu'];
expanded: boolean = false;
users: Observable;
@@ -198,10 +198,10 @@ export class PageManagement implements OnInit {
export() {
if (this.entries.total) {
- let rows = [[this.i18n.get('user.username'), this.i18n.get('turnover.price'), this.i18n.get('turnover.timeInvestment')]];
+ let rows = [[this.i18n.get('user.username'), this.i18n.get('turnover.price'), this.i18n.get('turnover.timeInvestment'), this.i18n.get('turnover.giftcard.priceUsage')]];
this.entries.results.forEach(result => {
- rows[rows.length] = [result[0], result[1], [result[2]]]
+ rows[rows.length] = [result[0], result[1], result[2], result[3]]
});
if (this.uiTurnovers) {
diff --git a/frontend/src/app/pages/notfound/notfound.page.html b/frontend/src/app/pages/notfound/notfound.page.html
index dbbf162..793ae3e 100644
--- a/frontend/src/app/pages/notfound/notfound.page.html
+++ b/frontend/src/app/pages/notfound/notfound.page.html
@@ -1,6 +1,6 @@
-
+
404
{{'not-found' | i18n}}
diff --git a/frontend/src/app/pages/password/password.page.html b/frontend/src/app/pages/password/password.page.html
index 668e646..5ded0ad 100644
--- a/frontend/src/app/pages/password/password.page.html
+++ b/frontend/src/app/pages/password/password.page.html
@@ -8,21 +8,21 @@
{{'password.error.' + error.key | i18n}}
-
+
{{'password.new' | i18n}}
{{'password.error.' + error.key | i18n}}
-
+
{{'password.repeat' | i18n}}
{{'password.error.' + error.key | i18n}}
-
+
diff --git a/frontend/src/app/pages/turnover/turnover.page.html b/frontend/src/app/pages/turnover/turnover.page.html
index ab52e1b..4ececb6 100644
--- a/frontend/src/app/pages/turnover/turnover.page.html
+++ b/frontend/src/app/pages/turnover/turnover.page.html
@@ -24,16 +24,16 @@
{{'turnover.customer' | i18n}}
-
- {{'turnover.customer.error' | i18n}}
+
+ {{'turnover.customer.error.' + error.key | i18n}}
{{'turnover.motif' | i18n}}
-
- {{'turnover.motif.error' | i18n}}
+
+ {{'turnover.motif.error.' + error.key | i18n}}
@@ -41,8 +41,29 @@
{{'turnover.price' | i18n}}
{{'turnover.price.suffix' | i18n}}
-
- {{'turnover.price.error' | i18n}}
+
+ {{'turnover.price.error.' + error.key | i18n}}
+
+
+
+
+ {{'turnover.giftcard' | i18n}}
+
+
+
+ {{'turnover.giftcard.number' | i18n}}
+
+
+ {{'turnover.giftcard.number.error.' + error.key | i18n}}
+
+
+
+
+ {{'turnover.giftcard.price' | i18n}}
+
+ {{'turnover.price.suffix' | i18n}}
+
+ {{'turnover.giftcard.price.error.' + error.key | i18n}}
@@ -50,24 +71,24 @@
{{'turnover.timeInvestment' | i18n}}
{{'turnover.timeInvestment.suffix' | i18n}}
-
- {{'turnover.timeInvestment.error' | i18n}}
+
+ {{'turnover.timeInvestment.error.' + error.key | i18n}}
{{'turnover.remark' | i18n}}
-
- {{'turnover.remark.error' | i18n}}
+
+ {{'turnover.remark.error.' + error.key | i18n}}
{{'turnover.materialConsumption' | i18n}}
-
- {{'turnover.materialConsumption.error' | i18n}}
+
+ {{'turnover.materialConsumption.error.' + error.key | i18n}}
diff --git a/frontend/src/app/pages/turnover/turnover.page.scss b/frontend/src/app/pages/turnover/turnover.page.scss
index 283f599..abf71bc 100644
--- a/frontend/src/app/pages/turnover/turnover.page.scss
+++ b/frontend/src/app/pages/turnover/turnover.page.scss
@@ -2,6 +2,11 @@ mat-form-field {
display: block;
margin: 20px 0 !important;
}
+
+.hidden {
+ display: none;
+}
+
form {
margin: 5px;
min-width: 390px;
diff --git a/frontend/src/app/pages/turnover/turnover.page.ts b/frontend/src/app/pages/turnover/turnover.page.ts
index a20ba40..2b3a5f2 100644
--- a/frontend/src/app/pages/turnover/turnover.page.ts
+++ b/frontend/src/app/pages/turnover/turnover.page.ts
@@ -26,6 +26,7 @@ export class PageTurnover implements OnInit {
username: string = "";
admin: boolean = false;
today: Moment = moment();
+ hasGiftcard: boolean = false;
constructor(
private turnoverService: TurnoverService,
@@ -43,6 +44,8 @@ export class PageTurnover implements OnInit {
customer: ['', Validators.required],
motif: ['', Validators.required],
price: ['', Validators.required],
+ giftcardNumber: ['', Validators.nullValidator],
+ giftcardPrice: ['', Validators.nullValidator],
timeInvestment: ['', Validators.nullValidator],
remark: ['', Validators.nullValidator],
materialConsumption: ['', Validators.nullValidator],
@@ -74,10 +77,12 @@ export class PageTurnover implements OnInit {
this.form.get("customer").setValue(this.turnover.customer);
this.form.get("motif").setValue(this.turnover.motif);
this.form.get("price").setValue(this.turnover.price);
+ this.form.get("giftcardNumber").setValue(this.turnover.giftcardNumber);
+ this.form.get("giftcardPrice").setValue(this.turnover.giftcardPrice);
this.form.get("timeInvestment").setValue(this.turnover.timeInvestment);
this.form.get("remark").setValue(this.turnover.remark);
this.form.get("materialConsumption").setValue(this.turnover.materialConsumption);
-
+ this.hasGiftcard = this.turnover.giftcardNumber || this.turnover.giftcardPrice || false;
},
error: (error) => {
if (error.status == 404) {
@@ -116,6 +121,13 @@ export class PageTurnover implements OnInit {
this.turnover.timeInvestment = this.form.get("timeInvestment").value;
this.turnover.remark = this.form.get("remark").value;
this.turnover.materialConsumption = this.form.get("materialConsumption").value;
+ if (this.hasGiftcard) {
+ this.turnover.giftcardNumber = this.form.get("giftcardNumber").value;
+ this.turnover.giftcardPrice = this.form.get("giftcardPrice").value;
+ } else {
+ this.turnover.giftcardNumber = undefined;
+ this.turnover.giftcardPrice = undefined;
+ }
this.turnoverService.create(this.turnover).subscribe({
next: (data) => {
@@ -152,6 +164,13 @@ export class PageTurnover implements OnInit {
this.turnover.timeInvestment = this.form.get("timeInvestment").value;
this.turnover.remark = this.form.get("remark").value;
this.turnover.materialConsumption = this.form.get("materialConsumption").value;
+ if (this.hasGiftcard) {
+ this.turnover.giftcardNumber = this.form.get("giftcardNumber").value;
+ this.turnover.giftcardPrice = this.form.get("giftcardPrice").value;
+ } else {
+ this.turnover.giftcardNumber = undefined;
+ this.turnover.giftcardPrice = undefined;
+ }
const request = this.admin ? this.turnoverManagementService.update(this.turnover) : this.turnoverService.update(this.turnover);
@@ -163,10 +182,11 @@ export class PageTurnover implements OnInit {
},
error: (error) => {
this.working = false;
+ this.success = false;
if (error.status == 403) {
this.snackBar.open("Error");
}
- if (error.status == 422) {
+ if (error.status == 409) {
let errors = {};
for (let code of error.error) {
errors[code.field] = errors[code.field] || {};
diff --git a/frontend/src/app/pages/turnovers/turnovers.page.html b/frontend/src/app/pages/turnovers/turnovers.page.html
index 768e29a..ff85cd3 100644
--- a/frontend/src/app/pages/turnovers/turnovers.page.html
+++ b/frontend/src/app/pages/turnovers/turnovers.page.html
@@ -1,4 +1,5 @@
+ @if (turnovers && !turnovers.error) {
+ }
-
+
\ No newline at end of file
diff --git a/frontend/src/app/pages/unavailable/unavailable.page.html b/frontend/src/app/pages/unavailable/unavailable.page.html
index f148ada..3dd40f7 100644
--- a/frontend/src/app/pages/unavailable/unavailable.page.html
+++ b/frontend/src/app/pages/unavailable/unavailable.page.html
@@ -1,6 +1,6 @@
-
+
503
{{'service-unavailable' | i18n}}
diff --git a/frontend/src/app/pages/users/create/users.create.page.scss b/frontend/src/app/pages/users/create/users.create.page.scss
index ee839a3..ae9f0bf 100644
--- a/frontend/src/app/pages/users/create/users.create.page.scss
+++ b/frontend/src/app/pages/users/create/users.create.page.scss
@@ -1,21 +1,22 @@
mat-form-field {
- display: block;
- margin: 20px 0 !important;
+ display: block;
+ margin: 20px 0 !important;
+}
+
+form {
+ margin: 5px;
+ min-width: 390px;
+
+ @media screen and (min-width: 576px) {
+ max-width: 100%;
}
- form {
- margin: 5px;
- min-width: 390px;
-
- @media screen and (min-width: 576px) {
- max-width: 100%;
- }
-
- @media screen and (min-width: 768px) {
- max-width: 80%;
- margin: 15px;
- }
-
- @media screen and (min-width: 992px) {
- max-width: 50%;
- }
- }
\ No newline at end of file
+
+ @media screen and (min-width: 768px) {
+ max-width: 80%;
+ margin: 15px;
+ }
+
+ @media screen and (min-width: 992px) {
+ max-width: 50%;
+ }
+}
\ No newline at end of file
diff --git a/frontend/src/app/pages/users/users.page.html b/frontend/src/app/pages/users/users.page.html
index 7eaefd5..3c90f1b 100644
--- a/frontend/src/app/pages/users/users.page.html
+++ b/frontend/src/app/pages/users/users.page.html
@@ -1,17 +1,19 @@
@if (users && users.error) {
-
-
-
- {{ 'users.error.' + users.error.status | i18n}}
- {{'users.error' | i18n}}
-
-
-
- {{ 'users.error.' + users.error.status + '.text' | i18n}}
-
-
-
+
+
+
+
+ {{ 'users.error.' + users.error.status | i18n}}
+ {{'users.error' | i18n}}
+
+
+
+ {{ 'users.error.' + users.error.status + '.text' | i18n}}
+
+
+
+
}
diff --git a/frontend/src/app/ui/turnovers/turnovers.ui.html b/frontend/src/app/ui/turnovers/turnovers.ui.html
index 49e5615..bb34287 100644
--- a/frontend/src/app/ui/turnovers/turnovers.ui.html
+++ b/frontend/src/app/ui/turnovers/turnovers.ui.html
@@ -1,20 +1,22 @@
@if (turnovers && turnovers.error) {
-
-
-
- {{ 'turnovers.error.' + turnovers.error.status | i18n}}
- {{'turnovers.error' | i18n}}
-
-
-
- {{ 'turnovers.error.' + turnovers.error.status + '.text' | i18n}}
-
-
-
+
+
+
+
+ {{ 'turnovers.error.' + turnovers.error.status | i18n}}
+ {{'turnovers.error' | i18n}}
+
+
+
+ {{ 'turnovers.error.' + turnovers.error.status + '.text' | i18n}}
+
+
+
+
}
-@if (turnovers) {
+@if (turnovers && !turnovers.error) {
@if (turnovers.total == 0) {
@@ -69,6 +71,22 @@
+