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
f1cebc0f
authored
Jan 14, 2018
by
Arturo Montejo Ráez
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
working on rooms handling
parent
983dc73b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
5 deletions
sails/src/assets/app/i18n/en-gb.json
sails/src/assets/app/i18n/es-es.json
sails/src/assets/scripts/modules/student/controllers/student.js
sails/src/config/pictogram.js
sails/src/assets/app/i18n/en-gb.json
View file @
f1cebc0f
...
...
@@ -437,6 +437,7 @@
"student_pictograms"
:
"Student's pictograms"
,
"student_updated"
:
"Student updated"
,
"students"
:
"Students"
,
"subscribed"
:
"Connected to student's account"
,
"sup_already_added"
:
"Supervisor already in the list"
,
"sup_not_added"
:
"Supervisor not added to the student"
,
"sup_not_deleted"
:
"The supervisor couldn't be deleted by the student"
,
...
...
sails/src/assets/app/i18n/es-es.json
View file @
f1cebc0f
...
...
@@ -435,6 +435,7 @@
"student_pictograms"
:
"Pictogramas del estudiante"
,
"student_updated"
:
"Estudiante actualizado"
,
"students"
:
"Alumnos"
,
"subscribed"
:
"Conectado a la cuenta del alumno"
,
"sup_already_added"
:
"El supervisor ya está en la lista"
,
"sup_not_added"
:
"El supervisor no se ha podido añadir al estudiante."
,
"sup_not_deleted"
:
"El supervisor no se ha podido desvincular del alumno."
,
...
...
sails/src/assets/scripts/modules/student/controllers/student.js
View file @
f1cebc0f
...
...
@@ -54,7 +54,13 @@ dashboardControllers.controller('StudentCtrl', function StudentCtrl(
$scope
.
studentData
.
pdb_count
=
data
.
pdb_count
;
$scope
.
$apply
();
}
});
});
io
.
socket
.
on
(
'disconnect'
,
function
()
{
$scope
.
studentData
.
pcb_count
=
0
;
$scope
.
studentData
.
pdb_count
=
0
;
ngToast
.
alert
(
$translate
.
instant
(
'no_subscribed'
));
});
io
.
socket
.
on
(
'reconnect'
,
function
()
{
// Subscribe to student's socket room
...
...
@@ -66,8 +72,13 @@ dashboardControllers.controller('StudentCtrl', function StudentCtrl(
},
token
:
$window
.
sessionStorage
.
token
},
function
()
{
// TODO ngToast res.msg (connected to student room)
function
(
data
)
{
if
(
data
.
room
.
search
(
'student'
)
!=
-
1
)
{
$scope
.
studentData
.
pcb_count
=
data
.
pcb_count
;
$scope
.
studentData
.
pdb_count
=
data
.
pdb_count
;
$scope
.
$apply
();
ngToast
.
alert
(
$translate
.
instant
(
'subscribed'
));
}
});
});
...
...
sails/src/config/pictogram.js
View file @
f1cebc0f
...
...
@@ -30,8 +30,8 @@ module.exports.pictogram = {
//
tpv
:
{
prices
:
{
foreverEuro
:
175
,
// non limited license in euros
oneYearEuro
:
70
,
// one year license in euros
foreverEuro
:
0.01
,
// non limited license in euros
oneYearEuro
:
0.01
,
// one year license in euros
},
merchantCode
:
'152038485'
,
// Code for Yotta
// key: 'sq7HjrUOBfKmC576ILgskD5srU870gJ7' // key for signing (test)
...
...
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