Skip to content

Restyle feat(dashboard): Show Team on Dashboard #759

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DanielHabenicht merged 1 commit into from
Oct 15, 2020
Merged

Restyle feat(dashboard): Show Team on Dashboard #759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 12 additions & 13 deletions Phonebook.Frontend/src/app/pages/dashboard/components/team/team.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,21 +23,20 @@ export class TeamComponent implements OnInit, OnDestroy {
public layouts: string[] = Object.values(Layout);
public layout: typeof Layout = Layout;

constructor(private organigramService: OrganigramService) { }
constructor(private organigramService: OrganigramService) {}

public ngOnInit() {
this.organigramService.getNodeForCurrentUser()
.subscribe(orgUnitOfUser => {
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 { }
public ngOnDestroy(): void {}
}
2 changes: 1 addition & 1 deletion Phonebook.Frontend/src/app/services/api/organigram.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down