|
- Nr.
+ {{ 'overview.number' | translate }}
|
{{ (pageSize * pageIndex) + dataSource.filteredData.indexOf(element) + 1 }}
@@ -16,24 +16,24 @@
- |
- Dokument
+ |
+ {{ 'overview.document' | translate }}
|
{{ element.name }}
|
-
- Typ
+ |
+ {{ 'overview.type' | translate }}
|
{{ element.storage }}
|
-
- Hochgeladen am
+ |
+ {{ 'overview.uploaded' | translate }}
|
{{ element.website }}
|
diff --git a/matsen-tool/src/app/documents/documents.component.ts b/matsen-tool/src/app/documents/documents.component.ts
index c3c417d..5984eef 100644
--- a/matsen-tool/src/app/documents/documents.component.ts
+++ b/matsen-tool/src/app/documents/documents.component.ts
@@ -10,13 +10,14 @@ import {NgIf} from "@angular/common";
import {ModalComponent} from "@app/_components/modal/modal.component";
import {NgbModal} from "@ng-bootstrap/ng-bootstrap";
import {NewDocumentComponent} from "@app/documents/new-document/new-document.component";
+import {TranslateModule} from "@ngx-translate/core";
@Component({
selector: 'app-documents',
templateUrl: './documents.component.html',
styleUrl: './documents.component.scss',
standalone: true,
- imports: [MatTableModule, MatSortModule, MatPaginatorModule, RouterLink, RouterLinkActive, NgIf],
+ imports: [MatTableModule, MatSortModule, MatPaginatorModule, RouterLink, RouterLinkActive, NgIf, TranslateModule],
})
export class DocumentsComponent {
@ViewChild(MatSort) sort;
diff --git a/matsen-tool/src/app/home/home.component.html b/matsen-tool/src/app/home/home.component.html
index 3664559..0327f3e 100644
--- a/matsen-tool/src/app/home/home.component.html
+++ b/matsen-tool/src/app/home/home.component.html
@@ -1,8 +1,8 @@
@@ -11,21 +11,21 @@
@@ -37,21 +37,21 @@
diff --git a/matsen-tool/src/app/home/home.component.ts b/matsen-tool/src/app/home/home.component.ts
index bd5ebb8..6652146 100644
--- a/matsen-tool/src/app/home/home.component.ts
+++ b/matsen-tool/src/app/home/home.component.ts
@@ -17,6 +17,8 @@ export class HomeComponent implements OnInit {
protected usersSub: Subscription;
protected users: Array ;
+ protected userIsAdmin: boolean;
+
constructor(
private accountService: AccountService,
private postService: PostService,
@@ -29,9 +31,15 @@ export class HomeComponent implements OnInit {
this.usersSub = new Subscription();
this.users = [];
+
+ this.userIsAdmin = false;
}
ngOnInit(): void {
+ console.log(this.user);
+ if (this.user) {
+ this.userIsAdmin = this.user.roles ? this.user.roles.includes('ROLE_ADMIN') : false;
+ }
this.postSub = this.postService.postsGetCollection().subscribe(
data => {
this.posts = data["hydra:member"];
diff --git a/matsen-tool/src/app/layout/two-column/two-column.component.html b/matsen-tool/src/app/layout/two-column/two-column.component.html
index a1bce63..21c180f 100644
--- a/matsen-tool/src/app/layout/two-column/two-column.component.html
+++ b/matsen-tool/src/app/layout/two-column/two-column.component.html
@@ -4,42 +4,42 @@
- Kunden
+ {{'basic.customer' | translate}}
- Dienstleister
+ {{'basic.supplier' | translate}}
- Lieferanten
+ {{'basic.service' | translate}}
- Produkte
+ {{'basic.products' | translate}}
- Aufgaben
+ {{'basic.tasks' | translate}}
- Dokumente
+ {{'basic.documents' | translate}}
@@ -47,7 +47,7 @@
-
+
diff --git a/matsen-tool/src/app/partners/new-partner/new-partner.component.html b/matsen-tool/src/app/partners/new-partner/new-partner.component.html
index 9bc8232..07b3ce8 100644
--- a/matsen-tool/src/app/partners/new-partner/new-partner.component.html
+++ b/matsen-tool/src/app/partners/new-partner/new-partner.component.html
@@ -1,46 +1,47 @@
-Neuer Partner
+{{'basic.new' | translate}} {{ partnerNameOne }}
+{{'basic.edit-before' | translate}} {{ partnerNameOne }} {{'basic.edit-after' | translate}}
-
+
diff --git a/matsen-tool/src/app/partners/new-partner/new-partner.component.ts b/matsen-tool/src/app/partners/new-partner/new-partner.component.ts
index 3d3b01b..99c3a52 100644
--- a/matsen-tool/src/app/partners/new-partner/new-partner.component.ts
+++ b/matsen-tool/src/app/partners/new-partner/new-partner.component.ts
@@ -22,6 +22,8 @@ export class NewPartnerComponent implements OnInit {
protected partnerSub: Subscription;
protected mediaSub: Subscription;
+ protected partnerNameOne: string;
+
constructor(
private partnerService: PartnerService,
private mediaService: MediaService,
@@ -32,10 +34,15 @@ export class NewPartnerComponent implements OnInit {
this.partnerSub = new Subscription();
this.mediaSub = new Subscription();
+
+ this.partnerNameOne = "";
}
ngOnInit(): void {
this.partnerForm = FormGroupInitializer.initFormGroup(this.partnerForm, this.partner);
+ this.translateService.get('basic.' + this.partner.type + 'One').subscribe((translation: string) => {
+ this.partnerNameOne = translation;
+ });
}
// On submit form: Check if image is set
diff --git a/matsen-tool/src/app/partners/partners-detail/partners-detail.component.html b/matsen-tool/src/app/partners/partners-detail/partners-detail.component.html
index 9da211f..dcbd0ad 100644
--- a/matsen-tool/src/app/partners/partners-detail/partners-detail.component.html
+++ b/matsen-tool/src/app/partners/partners-detail/partners-detail.component.html
@@ -37,8 +37,8 @@
@@ -101,8 +101,8 @@
- Aufgaben
-
+ {{'basic.tasks' | translate}}
+
- Notizen
-
+ {{'basic.posts' | translate}}
+
@@ -187,7 +187,7 @@
- Kommentieren
+ {{'basic.comment-it' | translate}}
0" class="rounded-1"
diff --git a/matsen-tool/src/app/partners/partners.component.html b/matsen-tool/src/app/partners/partners.component.html
index 6bb80d5..92cef0e 100644
--- a/matsen-tool/src/app/partners/partners.component.html
+++ b/matsen-tool/src/app/partners/partners.component.html
@@ -1,14 +1,16 @@
{{ partnerName }}
-
+
|
- Nr.
+ {{ 'overview.number' | translate }}
|
{{ (pageSize * pageIndex) + dataSource.filteredData.indexOf(element) + 1 }}
@@ -17,24 +19,27 @@
|
- Logo
+ {{ 'overview.logo' | translate }}
|
-
+
|
-
- Partner
+ |
+ {{ partnerNameOne }}
|
{{ element.name }} |
+ (click)="navigateToPartnerDetails(element)">{{ element.name }}
+ |
-
- Adresse
+ |
+ {{ 'overview.address' | translate }}
|
{{ element.street }} {{ element.streetNo }}
{{ element.zip }} {{ element.city }}
@@ -43,10 +48,11 @@
-
- Website
+ |
+ {{ 'overview.website' | translate }}
|
- {{ element.website }}
+ | {{ element.website }}
|
diff --git a/matsen-tool/src/app/partners/partners.component.ts b/matsen-tool/src/app/partners/partners.component.ts
index bcf6b46..2b03447 100644
--- a/matsen-tool/src/app/partners/partners.component.ts
+++ b/matsen-tool/src/app/partners/partners.component.ts
@@ -3,16 +3,14 @@ import {MatSort, Sort, MatSortModule} from "@angular/material/sort";
import {MatTableDataSource, MatTableModule} from "@angular/material/table";
import {ActivatedRoute, Router, RouterLink, RouterLinkActive} from "@angular/router";
import {Subscription} from "rxjs";
-import {ContactJsonld, PartnerJsonld, PartnerService} from "@app/core/api/v1";
+import {PartnerJsonld, PartnerService} from "@app/core/api/v1";
import {MatPaginator, MatPaginatorIntl, MatPaginatorModule, PageEvent} from "@angular/material/paginator";
import {OrderFilter} from "@app/_models/orderFilter";
import {ApiConverter} from "@app/_helpers/api.converter";
import {NgIf} from "@angular/common";
-import {ModalComponent} from "@app/_components/modal/modal.component";
import {NgbModal, NgbModalOptions} from "@ng-bootstrap/ng-bootstrap";
import {NewPartnerComponent} from "@app/partners/new-partner/new-partner.component";
import {TranslateModule, TranslateService} from "@ngx-translate/core";
-import {NewContactComponent} from "@app/contacts/new-contact/new-contact.component";
import {ModalStatus} from "@app/_helpers/modal.states";
import TypeEnum = PartnerJsonld.TypeEnum;
diff --git a/matsen-tool/src/app/postings/new-comment/new-comment.component.html b/matsen-tool/src/app/postings/new-comment/new-comment.component.html
index bf14d59..e99e7f9 100644
--- a/matsen-tool/src/app/postings/new-comment/new-comment.component.html
+++ b/matsen-tool/src/app/postings/new-comment/new-comment.component.html
@@ -1,15 +1,16 @@
-Neuer Kommentar
+{{'basic.new-comment' | translate}}
+{{'basic.edit-comment' | translate}}
diff --git a/matsen-tool/src/app/postings/new-posting/new-posting.component.html b/matsen-tool/src/app/postings/new-posting/new-posting.component.html
index eb1109e..86e9210 100644
--- a/matsen-tool/src/app/postings/new-posting/new-posting.component.html
+++ b/matsen-tool/src/app/postings/new-posting/new-posting.component.html
@@ -1,23 +1,24 @@
-Neue Notiz
+{{'basic.new-post' | translate}}
+{{'basic.edit-post' | translate}}
diff --git a/matsen-tool/src/app/products/new-product/new-product.component.html b/matsen-tool/src/app/products/new-product/new-product.component.html
index 4712683..6813637 100644
--- a/matsen-tool/src/app/products/new-product/new-product.component.html
+++ b/matsen-tool/src/app/products/new-product/new-product.component.html
@@ -1,24 +1,25 @@
-Neues Produkt
+{{'basic.new-product' | translate}}
+{{'basic.edit-product' | translate}}
-
+
diff --git a/matsen-tool/src/app/products/products.component.html b/matsen-tool/src/app/products/products.component.html
index d109fde..6a397db 100644
--- a/matsen-tool/src/app/products/products.component.html
+++ b/matsen-tool/src/app/products/products.component.html
@@ -1,14 +1,14 @@
- Produkte
-
+ {{ 'basic.products' | translate }}
+
|
- Nr.
+ {{ 'overview.number' | translate }}
|
{{ (productsPageSize * productPageIndex) + productsDataSource.filteredData.indexOf(element) + 1 }}
@@ -17,32 +17,37 @@
|
- Logo
+ {{ 'overview.image' | translate }}
|
-
+
|
-
- Produktname
+ |
+ {{ 'overview.productname' | translate }}
|
{{ element.name }} |
+ (click)="navigateToProductDetails(element)">{{ element.name }}
+ |
-
- Lagerbestand
+ |
+ {{ 'overview.storage' | translate }}
|
{{ element.storage }}
|
-
- Nummer
+ |
+ {{ 'overview.number-long' | translate }}
|
{{ element.number }}
|
diff --git a/matsen-tool/src/app/products/products.component.ts b/matsen-tool/src/app/products/products.component.ts
index 713a3df..a5f596d 100644
--- a/matsen-tool/src/app/products/products.component.ts
+++ b/matsen-tool/src/app/products/products.component.ts
@@ -2,24 +2,23 @@ import {AfterViewInit, ChangeDetectorRef, Component, OnInit, ViewChild} from '@a
import {MatSort, MatSortModule, Sort} from "@angular/material/sort";
import {MatPaginator, MatPaginatorIntl, MatPaginatorModule, PageEvent} from "@angular/material/paginator";
import {MatTableDataSource, MatTableModule} from "@angular/material/table";
-import {CommentJsonld, ContactJsonld, PartnerJsonld, ProductJsonld, ProductService} from "@app/core/api/v1";
+import {ProductJsonld, ProductService} from "@app/core/api/v1";
import {OrderFilter} from "@app/_models/orderFilter";
import {ApiConverter} from "@app/_helpers/api.converter";
import {Router, RouterLink, RouterLinkActive} from "@angular/router";
import {NgIf} from "@angular/common";
import {Subscription} from "rxjs";
-import {ModalComponent} from "@app/_components/modal/modal.component";
import {NgbModal, NgbModalOptions} from "@ng-bootstrap/ng-bootstrap";
import {NewProductComponent} from "@app/products/new-product/new-product.component";
-import {NewCommentComponent} from "@app/postings/new-comment/new-comment.component";
import {ModalStatus} from "@app/_helpers/modal.states";
+import {TranslateModule} from "@ngx-translate/core";
@Component({
selector: 'app-products',
templateUrl: './products.component.html',
styleUrl: './products.component.scss',
standalone: true,
- imports: [MatTableModule, MatSortModule, MatPaginatorModule, RouterLink, RouterLinkActive, NgIf],
+ imports: [MatTableModule, MatSortModule, MatPaginatorModule, RouterLink, RouterLinkActive, NgIf, TranslateModule],
})
export class ProductsComponent implements OnInit, AfterViewInit {
@ViewChild(MatSort) sort;
diff --git a/matsen-tool/src/app/tasks/tasks.component.html b/matsen-tool/src/app/tasks/tasks.component.html
index 34c0b7b..784362e 100644
--- a/matsen-tool/src/app/tasks/tasks.component.html
+++ b/matsen-tool/src/app/tasks/tasks.component.html
@@ -1,5 +1,5 @@
- Aufgaben
-
+ {{'basic.tasks' | translate}}
+
tasks works!
diff --git a/matsen-tool/src/assets/i18n/de.json b/matsen-tool/src/assets/i18n/de.json
index 87c58e7..9c6dabb 100644
--- a/matsen-tool/src/assets/i18n/de.json
+++ b/matsen-tool/src/assets/i18n/de.json
@@ -12,6 +12,73 @@
"service": "Lieferanten",
"customerOne": "Kunde",
"supplierOne": "Dienstleister",
- "serviceOne": "Lieferant"
+ "serviceOne": "Lieferant",
+ "products": "Produkte",
+ "documents": "Dokumente",
+ "tasks": "Aufgaben",
+ "contacts": "Kontakte",
+ "posts": "Notizen",
+ "comments": "Kommentare",
+ "new": "Neuer",
+ "new-product": "Neues Produkt",
+ "new-document": "Neues Dokument",
+ "new-task": "Neue Aufgabe",
+ "new-contact": "Neuer Kontakt",
+ "new-post": "Neue Notiz",
+ "new-comment": "Neuer Kommentar",
+ "edit-before": "",
+ "edit-after": "bearbeiten",
+ "edit-product": "Produkt bearbeiten",
+ "edit-document": "Dokument bearbeiten",
+ "edit-task": "Aufgabe bearbeiten",
+ "edit-contact": "Kontakt bearbeiten",
+ "edit-post": "Notiz bearbeiten",
+ "edit-comment": "Kommentar bearbeiten",
+ "details": "Details",
+ "comment-it": "Kommentieren",
+ "back": "Zurück"
+ },
+ "user":
+ {
+ "hello": "Hi"
+ },
+ "overview":
+ {
+ "sort": "Sortierung",
+ "number": "Nr.",
+ "logo": "Logo",
+ "address": "Adresse",
+ "website": "Website",
+ "image": "Bild",
+ "productname": "Produktname",
+ "storage": "Lagerbestand",
+ "number-long": "Nummer",
+ "document": "Dokument",
+ "type": "Typ",
+ "uploaded": "Hochgeladen am"
+ },
+ "form":
+ {
+ "mandatory": "ist erforderlich",
+ "email-validation": "Geben Sie eine gültige E-Mail-Adresse ein",
+ "name": "Name",
+ "street": "Straße",
+ "street-no": "Hausnummer",
+ "zip": "PLZ",
+ "city": "Stadt",
+ "country": "Land",
+ "website": "Website",
+ "upload-image": "Bild hochladen",
+ "firstname": "Vorname",
+ "lastname": "Nachname",
+ "birthday": "Geburtstag",
+ "position": "Position",
+ "email": "E-Mail",
+ "phone": "Telefon",
+ "description": "Beschreibung",
+ "headline": "Überschrift",
+ "message": "Nachricht",
+ "comment": "Kommentar",
+ "send": "Abschicken"
}
}
\ No newline at end of file
| |