Skip to content
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

feat(dashboard): Show Team on Dashboard #592

Open
wants to merge 37 commits into
base: master
Choose a base branch
from
Open

feat(dashboard): Show Team on Dashboard #592

Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
3acbecf
subheadings were added
friedaxvictoria Mar 20, 2020
20a1e91
new direction
friedaxvictoria Mar 23, 2020
951c5bd
first tries routing
friedaxvictoria Mar 23, 2020
3dc88d7
routing kind of works
friedaxvictoria Mar 23, 2020
b6abb55
small changes
friedaxvictoria Mar 24, 2020
ab15bd4
Revert "routing kind of works"
friedaxvictoria Mar 24, 2020
dab6d14
changed html
friedaxvictoria Mar 24, 2020
4448a1b
routing+initially team works
friedaxvictoria Mar 25, 2020
92c1cbc
routing works + new layout
friedaxvictoria Mar 26, 2020
863a8a4
cards added
friedaxvictoria Mar 26, 2020
4db4dd4
implementing the team
friedaxvictoria Mar 30, 2020
7fddd30
doesn't show team when no user
friedaxvictoria Apr 1, 2020
e8cce6e
displays team
friedaxvictoria Apr 1, 2020
19b35bd
with recursive function
friedaxvictoria Apr 3, 2020
5ba9bf2
separate routing module
friedaxvictoria Apr 7, 2020
4502785
Merge branch 'master' into #273
friedaxvictoria Apr 7, 2020
e0b7ad1
added routerGuard + titles in dashboard
friedaxvictoria Apr 8, 2020
cf2ce1b
routing bug fixed
friedaxvictoria Apr 9, 2020
36bf355
button disabled when no bookmarks
friedaxvictoria Apr 20, 2020
b4dae4a
Merge branch 'master' into #273
friedaxvictoria Apr 20, 2020
5373c20
mock user
friedaxvictoria Apr 22, 2020
2178a10
organigram test positiv
friedaxvictoria Apr 23, 2020
30b89e7
add tests for getNodeForUser and fix function
DanielHabenicht Apr 23, 2020
0c49040
Restyled by prettier (#638)
restyled-io[bot] Apr 23, 2020
0ac82b8
Merge branch 'master' into #273
DanielHabenicht May 1, 2020
ac88ace
clean css and merge errors
DanielHabenicht May 1, 2020
f03a5c4
different Layouts for team, changed css
friedaxvictoria May 4, 2020
5c0547c
Merge branch 'master' into #273
friedaxvictoria May 22, 2020
048cb1d
added function
friedaxvictoria Jun 2, 2020
36d49f9
fix the module path
paule96 Sep 9, 2020
5c6ea1b
Restyled by prettier (#712)
restyled-io[bot] Sep 9, 2020
5e0ee36
use the real user again
paule96 Sep 29, 2020
f053141
get the right orgunit from the services
paule96 Sep 29, 2020
8b25094
fix that the user can maybe null
paule96 Sep 29, 2020
c5176c1
fix the my team view! finaly! It looks awesome 🧙‍♂️😍
paule96 Sep 29, 2020
31ede9b
Restyled by prettier (#759)
restyled-io[bot] Oct 15, 2020
6c343a8
Update Phonebook.Frontend/src/app/services/api/current-user.service.ts
DanielHabenicht Dec 17, 2020
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
18 changes: 10 additions & 8 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 @@ -29,14 +29,16 @@ export class TeamComponent implements OnInit, OnDestroy {
if (this.currentUser != null) {
this.organigramService.getOrganigramTree()
.subscribe(organigram => {
let orgUnitOfUser = this.organigramService.getNodeForUser(this.currentUser, organigram, 0)
if (orgUnitOfUser != null) {
this.teamPersons = [
...orgUnitOfUser.supervisors,
...orgUnitOfUser.assistents,
...orgUnitOfUser.employees,
...orgUnitOfUser.learners,
];
if (this.currentUser != null) {
paule96 marked this conversation as resolved.
Show resolved Hide resolved
let orgUnitOfUser = this.organigramService.getNodeForUser(this.currentUser, organigram, 0)
if (orgUnitOfUser != null) {
this.teamPersons = [
...orgUnitOfUser.supervisors,
...orgUnitOfUser.assistents,
...orgUnitOfUser.employees,
...orgUnitOfUser.learners,
];
}
}
});
}
Expand Down