Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
yotta
/
pictogram
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
60
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
18fa13f7
authored
Sep 05, 2016
by
Fernando Martínez Santiago
Committed by
root
Sep 05, 2016
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
minor changes on session notifications from dashboard
parent
aea8543a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
sails/src/assets/scripts/modules/student/controllers/session.js
sails/src/config/sockets.js
sails/src/assets/scripts/modules/student/controllers/session.js
View file @
18fa13f7
...
...
@@ -99,7 +99,6 @@ dashboardControllers.controller('StudentSessionCtrl', function StudentSessionCtr
.
success
(
function
(
data
,
status
,
headers
,
config
)
{
// Add to list
$scope
.
wsessions
=
data
;
console
.
log
(
JSON
.
stringify
(
data
));
// Refresh navigation vars
$scope
.
currentPage
=
1
;
$scope
.
numPerPage
=
5
;
...
...
@@ -381,7 +380,7 @@ console.log(JSON.stringify(data));
io
.
socket
.
on
(
'update_peers'
,
function
(
data
)
{
if
(
$scope
.
ws
&&
$scope
.
actual_try
.
actions
&&
$scope
.
paused
==
false
&&
data
.
count
<
$scope
.
studentData
.
prev_num_peers
)
{
if
(
$scope
.
ws
&&
$scope
.
actual_try
.
actions
&&
$scope
.
paused
==
false
&&
data
.
count
<
2
)
{
$scope
.
pause_ws
();
$scope
.
pauseTimer
();
$translate
(
'room_changed'
).
then
(
function
(
translation
)
{
...
...
sails/src/config/sockets.js
View file @
18fa13f7
...
...
@@ -42,6 +42,7 @@ afterDisconnect: function (session, socket, cb) {
console
.
log
(
"Unubscribed room in socket afterDisconnect: "
+
rooms
[
i
]);
sails
.
hooks
.
rooms
.
unsubscribeFromRoom
(
rooms
[
i
],
socket
);
}
else
console
.
log
(
"Sockect disconnected without any room"
);
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment