Selaa lähdekoodia

bugfixes, icons

master
Florian Eisenmenger 1 vuosi sitten
vanhempi
commit
6378ec47f9
5 muutettua tiedostoa jossa 20 lisäystä ja 5 poistoa
  1. +1
    -1
      matsen-tool/src/app/_components/search-select/search-select.component.html
  2. +1
    -0
      matsen-tool/src/app/_views/partners/partners-detail/partners-detail.component.ts
  3. +6
    -2
      matsen-tool/src/app/_views/tasks/new-task-note/new-task-note.component.html
  4. +5
    -2
      matsen-tool/src/app/_views/tasks/task-list/task-list.component.html
  5. +7
    -0
      matsen-tool/src/assets/scss/_basics.scss

+ 1
- 1
matsen-tool/src/app/_components/search-select/search-select.component.html Näytä tiedosto

@@ -1,6 +1,6 @@
<div class="search-select">
<div class="show-name">
<p #paragraphRef (click)="openSearchBox()"></p>
<p #paragraphRef (click)="openSearchBox()" [class.search-empty]="!searchBoxFilled"></p>
<span class="spt-clear" *ngIf="searchBoxFilled" (click)="clearSearch()"></span>
</div>
<!-- <p>NAME {{documentForm.get(formId)}}<span>X</span></p>-->


+ 1
- 0
matsen-tool/src/app/_views/partners/partners-detail/partners-detail.component.ts Näytä tiedosto

@@ -95,6 +95,7 @@ export class PartnersDetailComponent implements OnInit, AfterViewInit {
50,
this.partnerId,
undefined,
undefined,
this.user?.id
).subscribe(
data => {


+ 6
- 2
matsen-tool/src/app/_views/tasks/new-task-note/new-task-note.component.html Näytä tiedosto

@@ -11,7 +11,7 @@
</div>

<div class="mb-3">
<label for="d" class="form-label">{{ 'form.contact' | translate }}:</label>
<label class="form-label">{{ 'form.contact' | translate }}:</label>
<app-search-select #contactSearchSelect
[formId]="'contactIri'"
[formLabelLangKey]="'form.product'"
@@ -29,7 +29,11 @@
<div class="d-flex mb-3">
<div class="form-check me-3" *ngFor="let type of contactTypes; let i = index">
<input type="radio" class="form-check-input" id="radio-{{ type }}" formControlName="contactType" [value]="type" />
<label for="radio-{{ type }}" class="form-check-label">{{ getContactTypeTranslationKey(type) | translate }}</label>
<label for="radio-{{ type }}" class="form-check-label bi" [class.bi-people]="type === 'personal'"
[class.bi-telephone]="type === 'phone'"
[class.bi-envelope]="type === 'email'">
{{ getContactTypeTranslationKey(type) | translate }}
</label>
</div>
</div>



+ 5
- 2
matsen-tool/src/app/_views/tasks/task-list/task-list.component.html Näytä tiedosto

@@ -104,9 +104,12 @@
<div class="card spt-comments" *ngFor="let taskNote of taskNotes.get(task.id)">
<div class="card-body">
<div class="d-flex justify-content-between align-items-center">
<p>{{ taskNote.owner?.firstName }} {{ taskNote.owner?.lastName }} - {{ getTranslationKey(taskNote.contactType) | translate }}
<p *ngIf="taskNote.owner !== undefined"><app-linked-label [user]="taskNote.owner"></app-linked-label> -
<span class="bi" [class.bi-people]="taskNote.contactType === 'personal'"
[class.bi-telephone]="taskNote.contactType === 'phone'"
[class.bi-envelope]="taskNote.contactType === 'email'"></span>
<ng-container *ngIf="taskNote.contact">
mit {{ taskNote.contact?.firstName }} {{ taskNote.contact?.lastName }}
mit <app-linked-label [contact]="taskNote.contact"></app-linked-label>
</ng-container>
</p>
<p>{{ taskNote.createdAt | date:'dd.MM.YYYY - HH:mm':'GMT+0000' }} Uhr</p>


+ 7
- 0
matsen-tool/src/assets/scss/_basics.scss Näytä tiedosto

@@ -383,6 +383,13 @@ img {
line-height: 24px;
min-height: 38px;
cursor: text;
&.search-empty {
&:before {
content: "Bitte wählen";
font-style: italic;
color: #999;
}
}
}
}
.search-toggle {


Ladataan…
Peruuta
Tallenna