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
0b38ca53
authored
Apr 06, 2017
by
Germán Callejas Alcántara
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Routes actualizado para upload_sound
parent
110968d7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
30 deletions
sails/src/api/controllers/StudentController.js
sails/src/config/routes.js
sails/src/api/controllers/StudentController.js
View file @
0b38ca53
...
@@ -1193,53 +1193,30 @@ module.exports = {
...
@@ -1193,53 +1193,30 @@ module.exports = {
*
*
* @param {response} res
* @param {response} res
* {
* {
* id: <stu_picto ID>,
* stu_picto
* student: <student ID>,
* attributes: {
* id_cat: categoryId or null,
* coord_x: 1 .. 5 or null,
* coord_y: 1 .. 10 or null,
* free_category_coord_x: 0 .. 4 or null,
* free_category_coord_y: 0 .. 9 or null,
* status: '[invisible]/enabled/disabled',
* highlight: true/[false],
* color: any valid HEX color or [null],
* expression: 'custom expression',
* legend: true/[false],
* uri_sound: 'path of sound associated',
* user_avatar:
* },
* picto: {
* id: <pictoID>,
* source: <sourceID>,
* owner: <ownerID> or null,
* id: <pictoID>,
* uri: <URL to image>,
* category: <categoryID>
* }
* }
* }
* }
*/
*/
upload_sound
:
function
(
req
,
res
)
{
upload_sound
:
function
(
req
,
res
)
{
var
soundFileName
;
var
soundFileName
;
var
soundDirectory
=
sails
.
config
.
pictogram
.
paths
.
pictoSoundDirectory
;
var
soundDirectory
=
sails
.
config
.
pictogram
.
paths
.
pictoSoundDirectory
;
if
(
!
supervisor
)
console
.
log
(
"Llega aqui 1"
);
throw
new
Error
(
"No supervisor found"
);
soundFileName
=
sails
.
config
.
pictogram
.
paths
.
getCustomPictoSoundFilename
(
req
.
params
.
id_stu_picto
);
soundFileName
=
sails
.
config
.
pictogram
.
paths
.
getCustomPictoSoundFilename
(
req
.
params
.
id_stu_picto
);
console
.
log
(
"Llega aqui 2"
);
req
.
file
(
'file'
).
upload
({
req
.
file
(
'file'
).
upload
({
maxBytes
:
1048576
,
maxBytes
:
1048576
,
dirname
:
soundDirectory
,
dirname
:
soundDirectory
,
saveAs
:
soundFileName
saveAs
:
soundFileName
},
function
whenDone
(
err
,
uploadedFiles
)
{
},
function
whenDone
(
err
,
uploadedFiles
)
{
console
.
log
(
"Llega aqui 3"
);
var
fs
=
require
(
'fs'
);
var
fs
=
require
(
'fs'
);
if
(
err
||
(
uploadedFiles
.
length
===
0
))
if
(
err
||
(
uploadedFiles
.
length
===
0
))
return
res
.
serverError
(
"Error uploading "
+
err
?
err
:
""
);
return
res
.
serverError
(
"Error uploading "
+
err
?
err
:
""
);
console
.
log
(
"Llega aqui 4"
);
StuPicto
.
findOne
({
id
:
req
.
params
.
id_stu_picto
})
StuPicto
.
findOne
({
id
:
req
.
params
.
id_stu_picto
})
.
then
(
sp
=>
{
.
then
(
sp
=>
{
console
.
log
(
"Picto encontrado"
)
sp
.
attributes
.
uri_sound
=
soundFileName
;
sp
.
attributes
.
uri_sound
=
soundFileName
;
sp
.
save
(
function
(
err
)
{
sp
.
save
(
function
(
err
)
{
if
(
err
)
throw
err
;
if
(
err
)
throw
err
;
...
...
sails/src/config/routes.js
View file @
0b38ca53
...
@@ -95,7 +95,7 @@ module.exports.routes = {
...
@@ -95,7 +95,7 @@ module.exports.routes = {
'POST /stu/login'
:
'StudentController.login'
,
'POST /stu/login'
:
'StudentController.login'
,
'POST /stu'
:
'StudentController.create'
,
'POST /stu'
:
'StudentController.create'
,
'POST /stu/upload'
:
'StudentController.upload'
,
'POST /stu/upload'
:
'StudentController.upload'
,
'POST /stu/
:id_sup/upload/:id
_picto'
:
'StudentController.upload_sound'
,
'POST /stu/
upload/:id_stu
_picto'
:
'StudentController.upload_sound'
,
'POST /stu/:id_stu/picto/:id_picto'
:
'StudentController.add_picto'
,
'POST /stu/:id_stu/picto/:id_picto'
:
'StudentController.add_picto'
,
'POST /stu/subscribe'
:
'StudentController.subscribe'
,
'POST /stu/subscribe'
:
'StudentController.subscribe'
,
'POST /stu/unsubscribe'
:
'StudentController.unsubscribe'
,
'POST /stu/unsubscribe'
:
'StudentController.unsubscribe'
,
...
...
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