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
bd3b65b6
authored
May 31, 2017
by
Jose Antonio
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Issue
#232
injecting id_scene and WS
parent
17f37b1e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
4 deletions
sails/src/assets/scripts/modules/student/controllers/collections.js
sails/src/assets/scripts/modules/student/controllers/pictoconfig.js
sails/src/assets/scripts/modules/student/controllers/tags.js
sails/src/assets/scripts/modules/student/controllers/collections.js
View file @
bd3b65b6
...
...
@@ -582,6 +582,9 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
},
stu
:
function
()
{
return
$scope
.
studentData
;
},
viewingScene
:
function
(){
return
$scope
.
viewingScene
;
}
}
});
...
...
@@ -605,6 +608,9 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
},
stu
:
function
()
{
return
$scope
.
studentData
;
},
viewingScene
:
function
(){
return
$scope
.
viewingScene
;
}
}
});
...
...
sails/src/assets/scripts/modules/student/controllers/pictoconfig.js
View file @
bd3b65b6
...
...
@@ -3,7 +3,18 @@
// Please note that $modalInstance represents a modal window (instance) dependency.
// It is not the same as the $modal service used above.
dashboardControllers
.
controller
(
'PictoConfigCtrl'
,
function
(
$window
,
$scope
,
$translate
,
$modalInstance
,
$http
,
config
,
ngToast
,
studentPicto
,
sup
,
stu
)
{
dashboardControllers
.
controller
(
'PictoConfigCtrl'
,
function
(
$window
,
$scope
,
$translate
,
$modalInstance
,
$http
,
config
,
ngToast
,
studentPicto
,
sup
,
stu
,
viewingScene
)
{
// Picto
$scope
.
studentPicto
=
JSON
.
parse
(
JSON
.
stringify
(
studentPicto
));
...
...
@@ -73,6 +84,7 @@ dashboardControllers.controller('PictoConfigCtrl', function ($window, $scope, $t
action
:
'update'
,
attributes
:
{
id_stu
:
stu
.
id
,
id_scene
:
viewingScene
.
id
,
stu_picto
:
result
}
},
...
...
sails/src/assets/scripts/modules/student/controllers/tags.js
View file @
bd3b65b6
...
...
@@ -13,6 +13,7 @@ dashboardControllers.controller('TagsCtrl', function TagsCtrl(
studentPicto
,
sup
,
stu
,
viewingScene
,
$translate
,
ngToast
)
{
...
...
@@ -52,9 +53,9 @@ dashboardControllers.controller('TagsCtrl', function TagsCtrl(
io
.
socket
.
post
(
'/stu/vocabulary'
,
{
action
:
'update'
,
attributes
:
{
id_stu
:
$scope
.
stu
,
stu_picto
:
studentPicto
.
id
,
id_scene
:
studentPicto
.
scene
id_stu
:
stu
.
id
,
id_scene
:
viewingScene
.
id
,
stu_picto
:
studentPicto
}
},
function
()
{});
...
...
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