Extract snackbar error message implementation to service #43
@ -1,7 +0,0 @@
|
|||||||
export class Qualification {
|
|
||||||
constructor(
|
|
||||||
public id?: number,
|
|
||||||
public skill?: string
|
|
||||||
) {
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,4 +1,4 @@
|
|||||||
import {Qualification} from "../Qualification";
|
import {Qualification} from "../qualification/Qualification";
|
||||||
|
|
||||||
export class Employee {
|
export class Employee {
|
||||||
constructor(
|
constructor(
|
||||||
|
0
src/app/qualification/details/details.component.css
Normal file
0
src/app/qualification/details/details.component.css
Normal file
21
src/app/qualification/details/details.component.html
Normal file
21
src/app/qualification/details/details.component.html
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
<h2 mat-dialog-title class="text-xl font-semibold mb-4">
|
||||||
|
Employees with {{ qualification.skill }}
|
||||||
|
</h2>
|
||||||
|
|
||||||
|
<mat-dialog-content>
|
||||||
|
@if (employees$ | async; as employees) {
|
||||||
|
@if (employees.length === 0) {
|
||||||
|
<p class="text-gray-500 italic">No employees found with this qualification.</p>
|
||||||
|
} @else {
|
||||||
|
@for (employee of employees; track employee.id) {
|
||||||
|
<a class="flex items-center p-3 bg-gray-50 rounded-lg hover:bg-gray-100 transition-colors">
|
||||||
|
<span class="font-medium">{{ employee.firstName }} {{ employee.lastName }}</span>
|
||||||
|
</a>
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</mat-dialog-content>
|
||||||
|
|
||||||
|
<mat-dialog-actions align="end" class="mt-4">
|
||||||
|
<button mat-button (click)="closeModal()">Close</button>
|
||||||
|
</mat-dialog-actions>
|
36
src/app/qualification/details/details.component.ts
Normal file
36
src/app/qualification/details/details.component.ts
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
import {Component, inject} from '@angular/core';
|
||||||
|
import {
|
||||||
|
MAT_DIALOG_DATA,
|
||||||
|
MatDialogActions,
|
||||||
|
MatDialogContent,
|
||||||
|
MatDialogRef,
|
||||||
|
MatDialogTitle
|
||||||
|
} from "@angular/material/dialog";
|
||||||
|
import QualificationService from "../../services/qualification.service";
|
||||||
|
import {Qualification} from "../Qualification";
|
||||||
|
import {AsyncPipe} from "@angular/common";
|
||||||
|
import {MatButton} from "@angular/material/button";
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'app-details',
|
||||||
|
imports: [
|
||||||
|
AsyncPipe,
|
||||||
|
MatDialogContent,
|
||||||
|
MatDialogTitle,
|
||||||
|
MatDialogActions,
|
||||||
|
MatButton
|
||||||
|
],
|
||||||
|
templateUrl: './details.component.html',
|
||||||
|
styleUrl: './details.component.css'
|
||||||
|
})
|
||||||
|
export class DetailsComponent {
|
||||||
|
private qualificationService = inject(QualificationService);
|
||||||
|
private dialogRef: MatDialogRef<DetailsComponent> = inject(MatDialogRef);
|
||||||
|
|
||||||
|
public qualification: Qualification = inject(MAT_DIALOG_DATA);
|
||||||
|
public employees$ = this.qualificationService.findEmployees(this.qualification.id);
|
||||||
|
|
||||||
|
closeModal() {
|
||||||
|
this.dialogRef.close();
|
||||||
|
}
|
||||||
|
}
|
@ -21,7 +21,14 @@
|
|||||||
|
|
||||||
<ng-container matColumnDef="skill">
|
<ng-container matColumnDef="skill">
|
||||||
<th mat-header-cell *matHeaderCellDef class="!text-left">Skill</th>
|
<th mat-header-cell *matHeaderCellDef class="!text-left">Skill</th>
|
||||||
<td mat-cell *matCellDef="let qualification" class="!py-4">{{ qualification.skill }}
|
<td mat-cell *matCellDef="let qualification" class="!py-4">
|
||||||
|
<a
|
||||||
|
class="!text-blue-600 hover:!underline cursor-pointer"
|
||||||
|
[matTooltip]="'Click to view qualification details'"
|
||||||
|
(click)="openDetailsModal(qualification)"
|
||||||
|
>
|
||||||
|
{{ qualification.skill }}
|
||||||
|
</a>
|
||||||
</td>
|
</td>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
|
|
||||||
|
@ -1,102 +1,105 @@
|
|||||||
import {Component, inject, OnInit} from '@angular/core';
|
import {Component, inject, OnInit} from '@angular/core';
|
||||||
import {Observable} from "rxjs";
|
import {Observable} from "rxjs";
|
||||||
import {Qualification} from "../Qualification";
|
import {Qualification} from "../Qualification";
|
||||||
import {AsyncPipe} from "@angular/common";
|
|
||||||
import {MatDialog} from "@angular/material/dialog";
|
import {MatDialog} from "@angular/material/dialog";
|
||||||
import QualificationService from "../../services/qualification.service";
|
import QualificationService from "../../services/qualification.service";
|
||||||
import {CreateComponent} from "../create/create.component";
|
import {CreateComponent} from "../create/create.component";
|
||||||
import {EditComponent} from "../edit/edit.component";
|
import {EditComponent} from "../edit/edit.component";
|
||||||
import {DeleteComponent} from "../delete/delete.component";
|
import {DeleteComponent} from "../delete/delete.component";
|
||||||
|
import {AsyncPipe} from "@angular/common";
|
||||||
import {MatButton, MatIconButton} from "@angular/material/button";
|
import {MatButton, MatIconButton} from "@angular/material/button";
|
||||||
import {
|
import {
|
||||||
MatCell,
|
MatCell,
|
||||||
MatCellDef,
|
MatCellDef,
|
||||||
MatColumnDef,
|
MatColumnDef,
|
||||||
MatHeaderCell,
|
MatHeaderCell,
|
||||||
MatHeaderCellDef,
|
MatHeaderCellDef,
|
||||||
MatHeaderRow,
|
MatHeaderRow, MatHeaderRowDef, MatRow, MatRowDef,
|
||||||
MatHeaderRowDef,
|
MatTable
|
||||||
MatRow,
|
|
||||||
MatRowDef,
|
|
||||||
MatTable
|
|
||||||
} from "@angular/material/table";
|
} from "@angular/material/table";
|
||||||
import {MatIcon} from "@angular/material/icon";
|
import {MatIcon} from "@angular/material/icon";
|
||||||
import {MatCard, MatCardContent} from "@angular/material/card";
|
import {MatCard, MatCardContent} from "@angular/material/card";
|
||||||
import {MatTooltip} from "@angular/material/tooltip";
|
import {MatTooltip} from "@angular/material/tooltip";
|
||||||
import {MatProgressSpinner} from "@angular/material/progress-spinner";
|
import {MatProgressSpinner} from "@angular/material/progress-spinner";
|
||||||
|
import {DetailsComponent} from "../details/details.component";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-qualifications',
|
selector: 'app-qualifications',
|
||||||
imports: [
|
imports: [
|
||||||
AsyncPipe,
|
AsyncPipe,
|
||||||
MatButton,
|
MatButton,
|
||||||
MatTable,
|
MatTable,
|
||||||
MatColumnDef,
|
MatColumnDef,
|
||||||
MatHeaderCell,
|
MatHeaderCell,
|
||||||
MatCell,
|
MatCell,
|
||||||
MatHeaderCellDef,
|
MatHeaderCellDef,
|
||||||
MatCellDef,
|
MatCellDef,
|
||||||
MatIconButton,
|
MatIconButton,
|
||||||
MatIcon,
|
MatIcon,
|
||||||
MatHeaderRow,
|
MatHeaderRow,
|
||||||
MatRow,
|
MatRow,
|
||||||
MatHeaderRowDef,
|
MatHeaderRowDef,
|
||||||
MatRowDef,
|
MatRowDef,
|
||||||
MatCard,
|
MatCard,
|
||||||
MatCardContent,
|
MatCardContent,
|
||||||
MatTooltip,
|
MatTooltip,
|
||||||
MatProgressSpinner
|
MatProgressSpinner
|
||||||
],
|
],
|
||||||
templateUrl: './table.component.html',
|
templateUrl: './table.component.html',
|
||||||
standalone: true,
|
styleUrl: './table.component.css'
|
||||||
styleUrl: './table.component.css'
|
|
||||||
})
|
})
|
||||||
export class QualificationsComponent implements OnInit {
|
export class QualificationsComponent implements OnInit {
|
||||||
public qualifications$!: Observable<Qualification[]>;
|
public qualifications$!: Observable<Qualification[]>;
|
||||||
public readonly displayedColumns: string[] = ['id', 'skill', 'actions'];
|
public readonly displayedColumns: string[] = ['id', 'skill', 'actions'];
|
||||||
|
|
||||||
private readonly dialog: MatDialog = inject(MatDialog);
|
private readonly dialog: MatDialog = inject(MatDialog);
|
||||||
private readonly qualificationService: QualificationService = inject(QualificationService);
|
private readonly qualificationService: QualificationService = inject(QualificationService);
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
this.loadQualifications();
|
|
||||||
}
|
|
||||||
|
|
||||||
private loadQualifications() {
|
|
||||||
this.qualifications$ = this.qualificationService.getAll();
|
|
||||||
}
|
|
||||||
|
|
||||||
openCreateModal() {
|
|
||||||
const dialogRef = this.dialog.open(CreateComponent);
|
|
||||||
|
|
||||||
dialogRef.afterClosed().subscribe((success: boolean) => {
|
|
||||||
if (success) {
|
|
||||||
this.loadQualifications();
|
this.loadQualifications();
|
||||||
}
|
}
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
openEditModal(qualification: Qualification) {
|
private loadQualifications() {
|
||||||
const dialogRef = this.dialog.open(EditComponent, {
|
this.qualifications$ = this.qualificationService.getAll();
|
||||||
data: qualification
|
}
|
||||||
});
|
|
||||||
|
|
||||||
dialogRef.afterClosed().subscribe((success: boolean) => {
|
openCreateModal() {
|
||||||
if (success) {
|
const dialogRef = this.dialog.open(CreateComponent);
|
||||||
this.loadQualifications();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
openDeleteModal(id: number) {
|
dialogRef.afterClosed().subscribe((success: boolean) => {
|
||||||
const dialogRef = this.dialog.open(DeleteComponent, {
|
if (success) {
|
||||||
data: id
|
this.loadQualifications();
|
||||||
});
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
dialogRef.afterClosed().subscribe((success: boolean) => {
|
openEditModal(qualification: Qualification) {
|
||||||
if (success) {
|
const dialogRef = this.dialog.open(EditComponent, {
|
||||||
this.loadQualifications();
|
data: qualification
|
||||||
}
|
});
|
||||||
});
|
|
||||||
}
|
dialogRef.afterClosed().subscribe((success: boolean) => {
|
||||||
|
if (success) {
|
||||||
|
this.loadQualifications();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
openDeleteModal(id: number) {
|
||||||
|
const dialogRef = this.dialog.open(DeleteComponent, {
|
||||||
|
data: id
|
||||||
|
});
|
||||||
|
|
||||||
|
dialogRef.afterClosed().subscribe((success: boolean) => {
|
||||||
|
if (success) {
|
||||||
|
this.loadQualifications();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
openDetailsModal(qualification: Qualification) {
|
||||||
|
const dialogRef = this.dialog.open(DetailsComponent, {
|
||||||
|
data: qualification
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,42 +0,0 @@
|
|||||||
<div class="flex">
|
|
||||||
<h1 class="text-2xl font-semibold">Qualifications</h1>
|
|
||||||
<button mat-flat-button class="ml-auto bg-blue-600" (click)="openCreateModal()">
|
|
||||||
<mat-icon class="mr-2">add</mat-icon>
|
|
||||||
Create qualification
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
@if (qualifications$ | async; as qualifications) {
|
|
||||||
@if (qualifications) {
|
|
||||||
<table
|
|
||||||
mat-table
|
|
||||||
[dataSource]="qualifications"
|
|
||||||
class="mat-elevation-z8"
|
|
||||||
>
|
|
||||||
<ng-container matColumnDef="id">
|
|
||||||
<th mat-header-cell *matHeaderCellDef>ID</th>
|
|
||||||
<td mat-cell *matCellDef="let qualification">{{ qualification.id }}</td>
|
|
||||||
</ng-container>
|
|
||||||
|
|
||||||
<ng-container matColumnDef="skill">
|
|
||||||
<th mat-header-cell *matHeaderCellDef>Skill</th>
|
|
||||||
<td mat-cell *matCellDef="let qualification">{{ qualification.skill }}</td>
|
|
||||||
</ng-container>
|
|
||||||
|
|
||||||
<ng-container matColumnDef="actions">
|
|
||||||
<th mat-header-cell *matHeaderCellDef>Actions</th>
|
|
||||||
<td mat-cell *matCellDef="let qualification">
|
|
||||||
<button mat-icon-button color="primary" (click)="openEditModal(qualification)">
|
|
||||||
<mat-icon>edit</mat-icon>
|
|
||||||
</button>
|
|
||||||
<button mat-icon-button color="warn" (click)="openDeleteModal(qualification.id)">
|
|
||||||
<mat-icon>delete</mat-icon>
|
|
||||||
</button>
|
|
||||||
</td>
|
|
||||||
</ng-container>
|
|
||||||
|
|
||||||
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
|
|
||||||
<tr mat-row *matRowDef="let row; columns: displayedColumns"></tr>
|
|
||||||
</table>
|
|
||||||
}
|
|
||||||
}
|
|
@ -2,6 +2,7 @@ import {inject, Injectable} from "@angular/core";
|
|||||||
import {HttpClient} from "@angular/common/http";
|
import {HttpClient} from "@angular/common/http";
|
||||||
import {map, Observable} from "rxjs";
|
import {map, Observable} from "rxjs";
|
||||||
import {Qualification} from "../qualification/Qualification";
|
import {Qualification} from "../qualification/Qualification";
|
||||||
|
import {Employee} from "../employee/Employee";
|
||||||
|
|
||||||
|
|
||||||
@Injectable({
|
@Injectable({
|
||||||
@ -14,7 +15,7 @@ export default class QualificationService {
|
|||||||
|
|
||||||
public getAll(): Observable<Qualification[]> {
|
public getAll(): Observable<Qualification[]> {
|
||||||
return this.http.get<Qualification[]>(`${QualificationService.BASE_URL}/qualifications`).pipe(
|
return this.http.get<Qualification[]>(`${QualificationService.BASE_URL}/qualifications`).pipe(
|
||||||
map(qualifications => qualifications.sort((a, b) => a.id - b.id))
|
map(qualifications => qualifications.sort((a, b) => a.id - b.id))
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -26,7 +27,14 @@ export default class QualificationService {
|
|||||||
return this.http.put(`${QualificationService.BASE_URL}/qualifications/${id}`, data)
|
return this.http.put(`${QualificationService.BASE_URL}/qualifications/${id}`, data)
|
||||||
}
|
}
|
||||||
|
|
||||||
delete(id: number) {
|
public delete(id: number) {
|
||||||
return this.http.delete(`${QualificationService.BASE_URL}/qualifications/${id}`)
|
return this.http.delete(`${QualificationService.BASE_URL}/qualifications/${id}`)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public findEmployees(id: number): Observable<Employee[]> {
|
||||||
|
return this.http.get<any>(`${QualificationService.BASE_URL}/qualifications/${id}/employees`)
|
||||||
|
.pipe(
|
||||||
|
map(response => response.employees)
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user