| @@ -24,7 +24,7 @@ | |||||
| {{ 'overview.sale-user' | translate }} | {{ 'overview.sale-user' | translate }} | ||||
| </th> | </th> | ||||
| <td mat-cell *matCellDef="let element"> | <td mat-cell *matCellDef="let element"> | ||||
| {{ element.ownerName }} | |||||
| <a [routerLink]="['/user', appHelperService.extractId(element.owner)]">{{ element.ownerName }}</a> | |||||
| </td> | </td> | ||||
| </ng-container> | </ng-container> | ||||
| @@ -21,8 +21,8 @@ | |||||
| </div> | </div> | ||||
| </div> | </div> | ||||
| </div> | </div> | ||||
| <div class="row"> | |||||
| <div class="col-4"> | |||||
| <div class="row spt-compact"> | |||||
| <div class="col-6"> | |||||
| <h2 class="m-0">{{ task.headline }}</h2> | <h2 class="m-0">{{ task.headline }}</h2> | ||||
| </div> | </div> | ||||
| <div class="col-8"> | <div class="col-8"> | ||||
| @@ -45,7 +45,7 @@ | |||||
| </div> | </div> | ||||
| <div class="card p-3" *ngIf="!taskCompactMode"> | <div class="card p-3" *ngIf="!taskCompactMode"> | ||||
| <div class="row"> | <div class="row"> | ||||
| <div class="col-4"> | |||||
| <div class="col-6"> | |||||
| <span class="due-date">{{ task.dueAt | date:'dd.MM.YYYY':'GMT+0000' }}</span> | <span class="due-date">{{ task.dueAt | date:'dd.MM.YYYY':'GMT+0000' }}</span> | ||||
| <h3 class="m-0" *ngIf="task.partner"><img src="/assets/images/icons/{{task.partnerType}}.svg" class="icon-mini" alt="" /><a href="/{{task.partnerType}}/{{this.appHelperService.extractId(task.partner)}}">{{task.partnerName}}</a></h3> | <h3 class="m-0" *ngIf="task.partner"><img src="/assets/images/icons/{{task.partnerType}}.svg" class="icon-mini" alt="" /><a href="/{{task.partnerType}}/{{this.appHelperService.extractId(task.partner)}}">{{task.partnerName}}</a></h3> | ||||
| <h3 class="m-0" *ngIf="task.product"><img src="/assets/images/icons/product.svg" class="icon-mini" alt="" /><a href="/product/{{this.appHelperService.extractId(task.product)}}">{{task.productName}}</a></h3> | <h3 class="m-0" *ngIf="task.product"><img src="/assets/images/icons/product.svg" class="icon-mini" alt="" /><a href="/product/{{this.appHelperService.extractId(task.product)}}">{{task.productName}}</a></h3> | ||||
| @@ -19,7 +19,7 @@ | |||||
| {{ 'overview.image' | translate }} | {{ 'overview.image' | translate }} | ||||
| </th> | </th> | ||||
| <td mat-cell *matCellDef="let element"> | <td mat-cell *matCellDef="let element"> | ||||
| <img role="button" src="{{ element.imageUrl }}" (click)="navigateToUserDetails(element)" width="40" | |||||
| <img src="{{ element.imageUrl }}" width="40" | |||||
| height="40" /> | height="40" /> | ||||
| </td> | </td> | ||||
| </ng-container> | </ng-container> | ||||
| @@ -29,7 +29,7 @@ | |||||
| {{ 'overview.firstName' | translate }} | {{ 'overview.firstName' | translate }} | ||||
| </th> | </th> | ||||
| <td mat-cell *matCellDef="let element"> | <td mat-cell *matCellDef="let element"> | ||||
| <span role="button" (click)="navigateToUserDetails(element)">{{ element.firstName }}</span> | |||||
| <span>{{ element.firstName }}</span> | |||||
| </td> | </td> | ||||
| </ng-container> | </ng-container> | ||||
| @@ -38,7 +38,7 @@ | |||||
| {{ 'overview.lastName' | translate }} | {{ 'overview.lastName' | translate }} | ||||
| </th> | </th> | ||||
| <td mat-cell *matCellDef="let element"> | <td mat-cell *matCellDef="let element"> | ||||
| <span role="button" (click)="navigateToUserDetails(element)">{{ element.lastName }}</span> | |||||
| <span>{{ element.lastName }}</span> | |||||
| </td> | </td> | ||||
| </ng-container> | </ng-container> | ||||
| @@ -47,7 +47,17 @@ | |||||
| {{ 'overview.email' | translate }} | {{ 'overview.email' | translate }} | ||||
| </th> | </th> | ||||
| <td mat-cell *matCellDef="let element"> | <td mat-cell *matCellDef="let element"> | ||||
| <span role="button" (click)="navigateToUserDetails(element)">{{ element.email }}</span> | |||||
| <span><a href="mailto:{{ element.email }}">{{ element.email }}</a></span> | |||||
| </td> | |||||
| </ng-container> | |||||
| <ng-container matColumnDef="details"> | |||||
| <th mat-header-cell class="text-end" *matHeaderCellDef> | |||||
| {{ 'overview.details' | translate }} | |||||
| </th> | |||||
| <td mat-cell class="text-end" *matCellDef="let element"> | |||||
| <span class="btn btn-primary spt-icon-details" | |||||
| data-type="user-tool" data-action="edit" (click)="navigateToUserDetails(element)"></span> | |||||
| </td> | </td> | ||||
| </ng-container> | </ng-container> | ||||
| @@ -30,7 +30,7 @@ export class UserListComponent implements OnInit, AfterViewInit { | |||||
| private router: Router, | private router: Router, | ||||
| protected appHelperService: AppHelperService, | protected appHelperService: AppHelperService, | ||||
| ) { | ) { | ||||
| this.displayedColumns = ['pos', 'image', 'firstName', 'lastName', 'email']; | |||||
| this.displayedColumns = ['pos', 'image', 'firstName', 'lastName', 'email', 'details']; | |||||
| this.sort = new MatSort(); | this.sort = new MatSort(); | ||||
| this.sort = new MatSort(); | this.sort = new MatSort(); | ||||
| @@ -412,3 +412,20 @@ img { | |||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| .spt-compact { | |||||
| position: relative; | |||||
| padding-top: 4px; | |||||
| &:before { | |||||
| content: ""; | |||||
| position: absolute; | |||||
| left: 12px; | |||||
| top: 0; | |||||
| height: 1px; | |||||
| width: calc(100% - 12px); | |||||
| background: #c1c1c1; | |||||
| } | |||||
| } | |||||
| .dropdown-menu { | |||||
| border-radius: 0; | |||||
| } | |||||