src/app/views/qualifications/qualifications.component.ts

@@ -138,6 +138,10 @@ export class QualificationsComponent {
                 return;
             }
             this.qualificationService.getAllQualificationEmployees({id: qualification.id}).subscribe((employees: QualificationEmployees) => {
+                if (employees.employees.length==0){
+                    this.execDelete(qualification);
+                    return;
+                }
                 const requests: Array<Observable<RemoveQualificationFromEmployeeResponse>> = [];
                 for (const employee of employees.employees) {
                     requests.push(this.employeeService.removeQualificationFromEmployee({
@@ -152,6 +156,12 @@ export class QualificationsComponent {
                             return;
                         }
                     }
+                    this.execDelete(qualification);
+                });
+            });
+        });
+    }
+    execDelete(qualification: Qualification){
         this.qualificationService.deleteQualification({id: qualification.id}).subscribe(() => {
             const data = this.qualificationDataSource.data;
             const i = data.indexOf(qualification);
@@ -161,8 +171,5 @@ export class QualificationsComponent {
             }
             this.notifications.publish(`Deleted ${qualification.skill}`, NotificationType.Information);
         });
-                });
-            });
-        });
     }
 }