diff --git a/matsen-tool/src/app/_views/contacts/contact-list/contact-list.component.html b/matsen-tool/src/app/_views/contacts/contact-list/contact-list.component.html index 927e075..5fd1f88 100644 --- a/matsen-tool/src/app/_views/contacts/contact-list/contact-list.component.html +++ b/matsen-tool/src/app/_views/contacts/contact-list/contact-list.component.html @@ -1,7 +1,8 @@
- +
+ title="{{contact.firstName}} {{contact.lastName}}"/> + alt=""/>

{{ contact.firstName }} {{ contact.lastName }}

diff --git a/matsen-tool/src/app/_views/contacts/contacts-detail/contacts-detail.component.html b/matsen-tool/src/app/_views/contacts/contacts-detail/contacts-detail.component.html index 234ef93..17f9608 100644 --- a/matsen-tool/src/app/_views/contacts/contacts-detail/contacts-detail.component.html +++ b/matsen-tool/src/app/_views/contacts/contacts-detail/contacts-detail.component.html @@ -6,28 +6,32 @@

{{ contact.firstName }} {{ contact.lastName }}

-
{{'form.position' | translate}}:
+
{{ 'form.position' | translate }}:
{{ contact.position }}
-
{{'form.phone' | translate}}:
+
{{ 'form.phone' | translate }}:
{{ contact.phone }}
-
{{'form.email' | translate}}:
+
{{ 'form.email' | translate }}:
{{ contact.email }}
-
{{'form.birthday' | translate}}:
+
{{ 'form.birthday' | translate }}:
{{ contact.birthday | date:'dd.MM.YYYY' }}
- {{contact.firstName}} {{contact.lastName}} + {{contact.firstName}} {{contact.lastName}} + src="/assets/images/icons/dummy-person.png" width="247" height="94" alt=""/>
diff --git a/matsen-tool/src/app/_views/contacts/new-contact/new-contact.component.html b/matsen-tool/src/app/_views/contacts/new-contact/new-contact.component.html index 675af87..114a5b6 100644 --- a/matsen-tool/src/app/_views/contacts/new-contact/new-contact.component.html +++ b/matsen-tool/src/app/_views/contacts/new-contact/new-contact.component.html @@ -1,59 +1,62 @@ -

{{'basic.new-contact' | translate}}

-

{{'basic.edit-contact' | translate}}

+

{{ 'basic.new-contact' | translate }}

+

{{ 'basic.edit-contact' | translate }}

- - -
- {{'form.firstname' | translate}} {{'form.mandatory' | translate}}. + + +
+ {{ 'form.firstname' | translate }} {{ 'form.mandatory' | translate }}.
- - + +
- {{'form.lastname' | translate}} {{'form.mandatory' | translate}}. + {{ 'form.lastname' | translate }} {{ 'form.mandatory' | translate }}.
- +
- - + +
- - + +
- {{'form.email-validation' | translate}}. + {{ 'form.email-validation' | translate }}.
- - + +
- - + +
- {{contact.firstName}} {{contact.lastName}} -

{{'system.delete-image' | translate}}

+ {{contact.firstName}} {{contact.lastName}} +

{{ 'system.delete-image' | translate }}

- +
diff --git a/matsen-tool/src/app/_views/documents/document-list/document-list.component.html b/matsen-tool/src/app/_views/documents/document-list/document-list.component.html index bd9b9dd..ada57ee 100644 --- a/matsen-tool/src/app/_views/documents/document-list/document-list.component.html +++ b/matsen-tool/src/app/_views/documents/document-list/document-list.component.html @@ -1,6 +1,7 @@
- +

{{ 'user.hello' | translate }} {{ user?.firstName }}!

- +
diff --git a/matsen-tool/src/app/_views/partners/partner-list/partner-list.component.html b/matsen-tool/src/app/_views/partners/partner-list/partner-list.component.html index a47a172..afc3397 100644 --- a/matsen-tool/src/app/_views/partners/partner-list/partner-list.component.html +++ b/matsen-tool/src/app/_views/partners/partner-list/partner-list.component.html @@ -1,6 +1,8 @@
- +
- {{partner.name}} + height="94" alt="{{partner.name}}" title="{{partner.name}}"/> + src="/assets/images/icons/dummy-company.png" width="247" height="94" alt=""/>
+ [partner]="partner"> + [partner]="partner"> + [partner]="partner"> diff --git a/matsen-tool/src/app/_views/partners/partners.component.html b/matsen-tool/src/app/_views/partners/partners.component.html index 3b1d59b..c7d2de1 100644 --- a/matsen-tool/src/app/_views/partners/partners.component.html +++ b/matsen-tool/src/app/_views/partners/partners.component.html @@ -3,6 +3,6 @@

{{ headline }}

diff --git a/matsen-tool/src/app/_views/posts/new-comment/new-comment.component.html b/matsen-tool/src/app/_views/posts/new-comment/new-comment.component.html index f7cc48b..11d428d 100644 --- a/matsen-tool/src/app/_views/posts/new-comment/new-comment.component.html +++ b/matsen-tool/src/app/_views/posts/new-comment/new-comment.component.html @@ -1,15 +1,16 @@ -

{{'basic.new-comment' | translate}}

-

{{'basic.edit-comment' | translate}}

+

{{ 'basic.new-comment' | translate }}

+

{{ 'basic.edit-comment' | translate }}

- +
- {{'form.comment' | translate}} {{'form.mandatory' | translate}}. + {{ 'form.comment' | translate }} {{ 'form.mandatory' | translate }}.
- +
diff --git a/matsen-tool/src/app/_views/posts/new-post/new-post.component.html b/matsen-tool/src/app/_views/posts/new-post/new-post.component.html index d8bd574..040be83 100644 --- a/matsen-tool/src/app/_views/posts/new-post/new-post.component.html +++ b/matsen-tool/src/app/_views/posts/new-post/new-post.component.html @@ -14,13 +14,13 @@

{{ post.owner?.fullName }}

+ href="/user/{{this.appHelperService.extractId(post.owner?.id)}}">{{ post.owner?.fullName }} +

{{ post.headline }}

diff --git a/matsen-tool/src/app/_views/products/assign-product/assign-product.component.html b/matsen-tool/src/app/_views/products/assign-product/assign-product.component.html index e4d79e0..b156eca 100644 --- a/matsen-tool/src/app/_views/products/assign-product/assign-product.component.html +++ b/matsen-tool/src/app/_views/products/assign-product/assign-product.component.html @@ -1,16 +1,15 @@ -

{{'basic.assign-product' | translate}}

- +

{{ 'basic.assign-product' | translate }}

@@ -18,17 +17,18 @@
- +
- + -
\ No newline at end of file +
diff --git a/matsen-tool/src/app/_views/products/assign-product/assign-product.component.ts b/matsen-tool/src/app/_views/products/assign-product/assign-product.component.ts index 7759a48..9e65dfc 100644 --- a/matsen-tool/src/app/_views/products/assign-product/assign-product.component.ts +++ b/matsen-tool/src/app/_views/products/assign-product/assign-product.component.ts @@ -1,7 +1,9 @@ import {AfterViewInit, Component, EventEmitter, Input, OnInit, Output, ViewChild} from '@angular/core'; import { - ContactPartnerProductJsonld, ContactPartnerProductService, - PartnerProductJsonld, PartnerProductService, ProductJsonld, + ContactPartnerProductJsonld, + ContactPartnerProductService, + PartnerProductJsonld, + PartnerProductService, ProductService, } from "@app/core/api/v1"; import {ModalStatus} from "@app/_helpers/modal.states"; @@ -9,22 +11,20 @@ import {FormGroupInitializer} from "@app/_helpers/formgroup.initializer"; import {FormGroup} from "@angular/forms"; import {contactPartnerProductForm, partnerProductForm} from "@app/_forms/apiForms"; import {SearchSelectComponent} from "@app/_components/search-select/search-select.component"; -import {MatTableDataSource} from "@angular/material/table"; -import {SearchInputColDef} from "@app/_components/search-input/search-input-col-def"; import {AppHelperService} from "@app/_helpers/app-helper.service"; import {ListGetDataFunctionType} from "@app/_components/list/list-get-data-function-type"; @Component({ - selector: 'app-assign-product', - templateUrl: './assign-product.component.html', - styleUrl: './assign-product.component.scss' + selector: 'app-assign-product', + templateUrl: './assign-product.component.html', + styleUrl: './assign-product.component.scss' }) export class AssignProductComponent implements OnInit, AfterViewInit { @Input() public partnerIri!: string; @Input() public partnerProduct!: PartnerProductJsonld; @Input() public contactPartnerProduct!: ContactPartnerProductJsonld; @Output() public submit: EventEmitter = new EventEmitter(); - @ViewChild('productSearchSelect', { static: false }) productSearchSelect!: SearchSelectComponent + @ViewChild('productSearchSelect', {static: false}) productSearchSelect!: SearchSelectComponent protected readonly SearchSelectComponent = SearchSelectComponent; protected form!: FormGroup;