Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
arsnova-lite
Manage
Activity
Members
Labels
Plan
Issues
24
Issue boards
Milestones
Wiki
Code
Merge requests
2
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Privacy
Imprint
Contact
Snippets
Groups
Projects
Show more breadcrumbs
ARSnova
arsnova-lite
Merge requests
!94
Resolve "Adjust participant-room view"
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Resolve "Adjust participant-room view"
135-adjust-participant-room-view
into
master
Overview
10
Commits
15
Pipelines
7
Changes
7
Merged
Lukas Mauß
requested to merge
135-adjust-participant-room-view
into
master
7 years ago
Overview
10
Commits
15
Pipelines
7
Changes
1
Expand
Closes
#135 (closed)
Proposed changes
Adjust participant room view
Added loading spinner to room-list, comment-list
Adjust room-list join butoon
For testing
Login as creator or participant and you should see the join buttons in room-list and the loading spinner before the list is loaded
Login as participant, join a room & you should see a new room-view
If you go to comments you should see the loading spinner
0
0
Merge request reports
Compare
version 3
version 6
9064c606
7 years ago
version 5
01bf4b67
7 years ago
version 4
bf9648c2
7 years ago
version 3
c29262aa
7 years ago
version 2
761259f8
7 years ago
version 1
684fe348
7 years ago
master (base)
and
version 4
latest version
a615bad3
15 commits,
7 years ago
version 6
9064c606
14 commits,
7 years ago
version 5
01bf4b67
12 commits,
7 years ago
version 4
bf9648c2
11 commits,
7 years ago
version 3
c29262aa
10 commits,
7 years ago
version 2
761259f8
9 commits,
7 years ago
version 1
684fe348
8 commits,
7 years ago
Show latest version
1 file
+
11
−
5
Expand all files
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
src/app/comment-list/comment-list.component.ts
+
11
−
5
Options
@@ -27,7 +27,8 @@ export class CommentListComponent implements OnInit {
private
roomService
:
RoomService
,
private
location
:
Location
,
private
commentService
:
CommentService
,
private
notification
:
NotificationService
)
{
}
private
notification
:
NotificationService
)
{
}
ngOnInit
()
{
this
.
userRole
=
this
.
authenticationService
.
getRole
();
@@ -47,16 +48,21 @@ export class CommentListComponent implements OnInit {
getComments
(
roomId
:
string
):
void
{
if
(
this
.
userRole
===
UserRole
.
CREATOR
)
{
this
.
commentService
.
getComments
(
roomId
)
.
subscribe
(
comments
=>
this
.
comments
=
comments
);
.
subscribe
(
comments
=>
{
this
.
comments
=
comments
;
this
.
isLoading
=
false
;
});
}
else
if
(
this
.
userRole
===
UserRole
.
PARTICIPANT
)
{
this
.
commentService
.
searchComments
(
roomId
,
this
.
user
.
id
)
.
subscribe
(
comments
=>
this
.
comments
=
comments
);
.
subscribe
(
comments
=>
{
this
.
comments
=
comments
;
this
.
isLoading
=
false
;
});
}
this
.
isLoading
=
false
;
}
setRead
(
comment
:
Comment
):
void
{
this
.
comments
.
find
(
c
=>
c
.
id
===
comment
.
id
).
read
=
!
comment
.
read
;
this
.
comments
.
find
(
c
=>
c
.
id
===
comment
.
id
).
read
=
!
comment
.
read
;
this
.
commentService
.
updateComment
(
comment
).
subscribe
();
}