diff --git a/matsen-tool/src/app/app-routing.module.ts b/matsen-tool/src/app/app-routing.module.ts
index 081653b..41725cc 100644
--- a/matsen-tool/src/app/app-routing.module.ts
+++ b/matsen-tool/src/app/app-routing.module.ts
@@ -13,6 +13,7 @@ import {ContactsComponent} from "@app/contacts/contacts.component";
import {ContactsDetailComponent} from "@app/contacts/contacts-detail/contacts-detail.component";
import {TasksComponent} from "@app/tasks/tasks.component";
import {SalesComponent} from "@app/sales/sales.component";
+import {SalesDetailComponent} from "@app/sales/sales-detail/sales-detail.component";
const accountModule = () => import('./account/account.module').then(x => x.AccountModule);
const usersModule = () => import('./users/users.module').then(x => x.UsersModule);
@@ -88,6 +89,7 @@ const routes: Routes = [
canActivate: [AuthGuard],
children: [
{path: '', component: SalesComponent, data: {dataType: 'sales'}},
+ {path: ':id', component: SalesDetailComponent, data: {dataType: 'sales-detail'}},
]
},
diff --git a/matsen-tool/src/app/app.component.html b/matsen-tool/src/app/app.component.html
index 2656301..3109f46 100644
--- a/matsen-tool/src/app/app.component.html
+++ b/matsen-tool/src/app/app.component.html
@@ -9,7 +9,6 @@
-
-
+
+
diff --git a/matsen-tool/src/app/documents/documents.component.html b/matsen-tool/src/app/documents/documents.component.html
index 1340a4e..f52aca4 100644
--- a/matsen-tool/src/app/documents/documents.component.html
+++ b/matsen-tool/src/app/documents/documents.component.html
@@ -49,15 +49,6 @@
-
-
- {{ 'overview.download' | translate }}
- |
- Herunterladen
- |
-
-
@@ -76,10 +67,18 @@
+
+ |
+
+
+ |
+
+
|
-
|
diff --git a/matsen-tool/src/app/documents/documents.component.ts b/matsen-tool/src/app/documents/documents.component.ts
index f333343..71e1d64 100644
--- a/matsen-tool/src/app/documents/documents.component.ts
+++ b/matsen-tool/src/app/documents/documents.component.ts
@@ -44,7 +44,7 @@ export class DocumentsComponent {
private documentService: DocumentService
) {
this.sort = new MatSort();
- this.displayedColumns = ['pos', 'name', 'description', 'download', 'partnerName', 'productName', 'createdAt', 'createdByName', 'edit'];
+ this.displayedColumns = ['pos', 'name', 'description', 'partnerName', 'productName', 'createdAt', 'createdByName', 'download', 'edit'];
this.documentsSub = new Subscription();
this.documents = [];
diff --git a/matsen-tool/src/app/sales/sales.component.html b/matsen-tool/src/app/sales/sales.component.html
index 8c26d1b..5240d55 100644
--- a/matsen-tool/src/app/sales/sales.component.html
+++ b/matsen-tool/src/app/sales/sales.component.html
@@ -8,14 +8,16 @@
{{ saleSummary.ownerName }}
-
+
{{ 'sales.turnover' | translate }}: {{ saleSummary.turnover | currency: 'EUR' }}
-
+
{{ 'sales.profit' | translate }}: {{ saleSummary.profit | currency: 'EUR' }}
@@ -41,9 +43,7 @@
{{ 'overview.sale-user' | translate }}
|
-
- {{ element.ownerName }}
-
+ {{ element.ownerName }}
|
@@ -53,7 +53,7 @@
{{ 'overview.sale-partner' | translate }}
- {{ element.partnerName }}
+ {{ element.partnerName }}
|
@@ -63,7 +63,7 @@
{{ 'overview.productname' | translate }}
- {{ element.productName }}
+ {{ element.productName }}
|
@@ -97,6 +97,16 @@
+
+
+ {{ 'overview.details' | translate }}
+ |
+
+
+ |
+
+
diff --git a/matsen-tool/src/app/sales/sales.component.ts b/matsen-tool/src/app/sales/sales.component.ts
index c085eec..fde7b0f 100644
--- a/matsen-tool/src/app/sales/sales.component.ts
+++ b/matsen-tool/src/app/sales/sales.component.ts
@@ -1,5 +1,6 @@
import {ChangeDetectorRef, Component, LOCALE_ID, OnInit, ViewChild} from '@angular/core';
import {
+ ContactJsonld,
ProductJsonld,
SaleJsonld,
SaleService,
@@ -64,7 +65,7 @@ export class SalesComponent implements OnInit {
private router: Router,
) {
this.sort = new MatSort();
- this.displayedColumns = ['pos', 'user', 'partner', 'product', 'turnover', 'profit', 'date'];
+ this.displayedColumns = ['pos', 'user', 'partner', 'product', 'turnover', 'profit', 'date', 'details'];
this.salesSub = new Subscription();
this.sales = [];
this.salesSummarySub = new Subscription();
@@ -159,8 +160,9 @@ export class SalesComponent implements OnInit {
}
navigateToSaleDetails(element: any) {
- // const product: ProductJsonld = element as ProductJsonld;
- // this.router.navigate(['/products', ApiConverter.extractId(product.id)]);
+ console.log(element);
+ // const sale: SaleJsonld = element as SaleJsonld;
+ // this.router.navigate(['/sales', ApiConverter.extractId(sale.id)]);
}
openModalNewSale() {
@@ -177,4 +179,5 @@ export class SalesComponent implements OnInit {
}
protected readonly Number = Number;
+ protected readonly ApiConverter = ApiConverter;
}
diff --git a/matsen-tool/src/assets/i18n/de.json b/matsen-tool/src/assets/i18n/de.json
index 31aba50..534e0ba 100644
--- a/matsen-tool/src/assets/i18n/de.json
+++ b/matsen-tool/src/assets/i18n/de.json
@@ -75,6 +75,7 @@
"product": "Produkt",
"sale-user": "Verkäufer",
"sale-partner": "Kunde",
+ "details": "Details",
"turnover": "Umsatz",
"profit": "Gewinn",
"createdAt": "erstellt am"
diff --git a/matsen-tool/src/assets/scss/_button.scss b/matsen-tool/src/assets/scss/_button.scss
index f410972..95c8210 100644
--- a/matsen-tool/src/assets/scss/_button.scss
+++ b/matsen-tool/src/assets/scss/_button.scss
@@ -14,7 +14,7 @@
@include transition();
&:hover {
- color: $color-matsen;
+ background: $color-matsen;
}
}