fix the my team view! finaly! It looks awesome 🧙‍♂️😍

Author: paule96

Phonebook.Frontend/src/app/pages/dashboard/components/team/team.component.ts

@@ -26,22 +26,17 @@ export class TeamComponent implements OnInit, OnDestroy {
   constructor(private organigramService: OrganigramService) { }
 
   public ngOnInit() {
-    if (this.currentUser != null) {
-      this.organigramService.getOrganigramTree()
-        .subscribe(organigram => {
-          if (this.currentUser != null) {
-            let orgUnitOfUser = this.organigramService.getNodeForUser(this.currentUser, organigram, 0)
-            if (orgUnitOfUser != null) {
-              this.teamPersons = [
-                ...orgUnitOfUser.supervisors,
-                ...orgUnitOfUser.assistents,
-                ...orgUnitOfUser.employees,
-                ...orgUnitOfUser.learners,
-              ];
-            }
-          }
-        });
-    }
+    this.organigramService.getNodeForCurrentUser()
+      .subscribe(orgUnitOfUser => {
+        if (orgUnitOfUser != null) {
+          this.teamPersons = [
+            ...orgUnitOfUser.supervisors,
+            ...orgUnitOfUser.assistents,
+            ...orgUnitOfUser.employees,
+            ...orgUnitOfUser.learners,
+          ];
+        }
+      });
   }
 
   public ngOnDestroy(): void { }

Phonebook.Frontend/src/app/services/api/organigram.service.ts

@@ -12,7 +12,7 @@ export class OrganigramService {
     private http: HttpClient,
     private personService: PersonService,
     private currentUserService: CurrentUserService
-  ) {}
+  ) { }
   public organigram: Observable<UnitTreeNode[]>;
   public orgUnits: Observable<OrgUnit[]>;
   public team: UnitTreeNode;
@@ -110,7 +110,10 @@ export class OrganigramService {
     if (user.Business.ShortOrgUnit.length > depth) {
       for (const node of nodeChilds) {
         if (node.id === user.Business.ShortOrgUnit[depth] && node.depth === depth) {
-          return node;
+          if (user.Business.ShortOrgUnit.length == depth + 1) {
+            return node;
+          }
+          return this.getNodeForUser(user, node.children, depth + 1);
         }
         if (node.id !== user.Business.ShortOrgUnit[depth] && node.depth === depth) {
           continue;