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
7124675d
authored
Jun 14, 2016
by
Arturo Montejo Ráez
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
pictos no mostrados en sesión, corregido
parent
b791bd7d
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
6 deletions
android/Pictogram/app/build.gradle
sails/src/api/controllers/StudentController.js
sails/src/api/controllers/TryController.js
sails/src/api/controllers/WorkingSessionController.js
android/Pictogram/app/build.gradle
View file @
7124675d
...
@@ -47,6 +47,9 @@ android {
...
@@ -47,6 +47,9 @@ android {
LocalFlavor
{
LocalFlavor
{
resValue
"string"
,
"server"
,
"https://192.168.1.37:1337"
resValue
"string"
,
"server"
,
"https://192.168.1.37:1337"
}
}
DevFlavor
{
resValue
"string"
,
"server"
,
"https://dev.yottacode.com"
}
DefaultFlavor
{
DefaultFlavor
{
resValue
"string"
,
"server"
,
"https://pre.yottacode.com"
resValue
"string"
,
"server"
,
"https://pre.yottacode.com"
signingConfig
signingConfigs
.
release_config
signingConfig
signingConfigs
.
release_config
...
...
sails/src/api/controllers/StudentController.js
View file @
7124675d
...
@@ -1015,15 +1015,17 @@ module.exports = {
...
@@ -1015,15 +1015,17 @@ module.exports = {
sails
.
log
.
debug
(
"Inside action. Student:"
+
attributes
.
id_stu
);
sails
.
log
.
debug
(
"Inside action. Student:"
+
attributes
.
id_stu
);
if
(
req
.
isSocket
)
{
if
(
req
.
isSocket
)
{
sails
.
log
.
debug
(
"websockets - room "
+
roomName
);
sails
.
log
.
debug
(
"websockets - room "
+
sails
.
hooks
.
rooms
.
student
(
attributes
.
id_stu
)
);
// BROADCAST to everyone subscribed to this student
// BROADCAST to everyone subscribed to this student
const
socketToOmit
=
(
req
.
isSocket
)
?
req
.
socket
:
undefined
;
const
socketToOmit
=
(
req
.
isSocket
)
?
req
.
socket
:
undefined
;
sails
.
hooks
.
events
.
broadcast
(
sails
.
hooks
.
events
.
broadcast
Event
(
sails
.
hooks
.
rooms
.
student
(
attributes
.
id_stu
),
sails
.
hooks
.
rooms
.
student
(
attributes
.
id_stu
),
'action'
,
{
{
name
:
'action'
,
data
:
{
"action"
:
action
,
"action"
:
action
,
"attributes"
:
attributes
"attributes"
:
attributes
}
},
},
socketToOmit
socketToOmit
);
);
...
@@ -1043,8 +1045,10 @@ module.exports = {
...
@@ -1043,8 +1045,10 @@ module.exports = {
description
:
desc
description
:
desc
})
})
.
exec
(
function
(
err
,
created
)
{
.
exec
(
function
(
err
,
created
)
{
if
(
err
)
if
(
err
)
{
sails
.
log
.
error
(
err
.
details
);
res
.
serverError
(
err
.
details
);
res
.
serverError
(
err
.
details
);
}
else
if
(
created
)
else
if
(
created
)
res
.
json
({
res
.
json
({
action
:
created
action
:
created
...
@@ -1056,6 +1060,8 @@ module.exports = {
...
@@ -1056,6 +1060,8 @@ module.exports = {
msg: "Action "+ action +" action from student " + attributes.id_stu
msg: "Action "+ action +" action from student " + attributes.id_stu
});
});
*/
*/
}
else
{
sails
.
log
.
debug
(
"No socket request for action"
);
}
}
},
},
...
@@ -1070,7 +1076,7 @@ module.exports = {
...
@@ -1070,7 +1076,7 @@ module.exports = {
if
(
req
.
isSocket
)
{
if
(
req
.
isSocket
)
{
const
socketToOmit
=
(
req
.
isSocket
)
?
req
.
socket
:
undefined
;
const
socketToOmit
=
(
req
.
isSocket
)
?
req
.
socket
:
undefined
;
sails
.
hooks
.
events
.
broadcast
(
sails
.
hooks
.
events
.
broadcast
Event
(
sails
.
hooks
.
rooms
.
student
(
attributes
.
id_stu
),
sails
.
hooks
.
rooms
.
student
(
attributes
.
id_stu
),
'action'
,
'action'
,
{
{
...
...
sails/src/api/controllers/TryController.js
View file @
7124675d
// @TODO 357
// @TODO 357
module
.
exports
=
{
module
.
exports
=
{
// create action
// create action
// adds a try
// adds a try
//
//
create
:
function
(
req
,
res
)
{
create
:
function
(
req
,
res
)
{
...
...
sails/src/api/controllers/WorkingSessionController.js
View file @
7124675d
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