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
8b8869a6
authored
Jun 05, 2017
by
Arturo Montejo Ráez
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fixed issued
#261
parent
fafde781
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
3 additions
and
3 deletions
sails/src/api/controllers/StudentController.js
sails/src/api/models/Student.js
sails/src/assets/scripts/modules/student/views/header.html
sails/src/config/pictogram.js
sails/src/api/controllers/StudentController.js
View file @
8b8869a6
sails/src/api/models/Student.js
View file @
8b8869a6
...
@@ -303,7 +303,7 @@ module.exports = {
...
@@ -303,7 +303,7 @@ module.exports = {
if
(
err
)
if
(
err
)
return
callback
(
err
,
[]);
return
callback
(
err
,
[]);
if
(
!
stuSups
||
stuSups
.
length
==
0
)
if
(
!
stuSups
||
stuSups
.
length
==
0
)
return
callback
(
n
ew
Error
(
"No supervisors found"
)
,
[]);
return
callback
(
n
ull
,
[]);
var
sups
=
stuSups
.
map
((
st
)
=>
{
return
st
.
supervisor
});
var
sups
=
stuSups
.
map
((
st
)
=>
{
return
st
.
supervisor
});
return
callback
(
null
,
sups
);
return
callback
(
null
,
sups
);
...
...
sails/src/assets/scripts/modules/student/views/header.html
View file @
8b8869a6
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
</div>
</div>
</div>
</div>
<div
class=
"col-md-9"
>
<div
class=
"col-md-9"
>
<div
style=
"margin-left: 5px"
><h4>
{{studentData.name}} {{studentData.surname}}
</h4></div>
<div
style=
"margin-left: 5px"
><h4>
{{studentData.name}} {{studentData.surname}}
ID: {{studentData.supervision}}
</h4></div>
<div
style=
"margin-left: 5px"
class=
"text-left"
>
<div
style=
"margin-left: 5px"
class=
"text-left"
>
<span>
{{studentData.current_instruction | translate}}
</span><br/>
<span>
{{studentData.current_instruction | translate}}
</span><br/>
<span
class=
"text-muted"
>
({{studentData.current_method | translate}})
</span>
<span
class=
"text-muted"
>
({{studentData.current_method | translate}})
</span>
...
...
sails/src/config/pictogram.js
View file @
8b8869a6
...
@@ -6,7 +6,7 @@ var ASSETS_PATH = path.join(__dirname, '..', 'assets');
...
@@ -6,7 +6,7 @@ var ASSETS_PATH = path.join(__dirname, '..', 'assets');
var
UPLOAD_PATH
=
path
.
join
(
__dirname
,
'..'
,
'..'
,
'upload'
);
var
UPLOAD_PATH
=
path
.
join
(
__dirname
,
'..'
,
'..'
,
'upload'
);
module
.
exports
.
pictogram
=
{
module
.
exports
.
pictogram
=
{
version
:
"1.
1
"
,
// actual version of the server, to be checked by the client
version
:
"1.
2
"
,
// actual version of the server, to be checked by the client
admins
:
[
admins
:
[
{
{
email
:
'amontejo@ujaen.es'
,
email
:
'amontejo@ujaen.es'
,
...
...
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