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
9af2cee6
authored
Jun 19, 2017
by
Sebastián Collado Montañez
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
issue
#269
fixed
parent
5474d8ff
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
sails/src/assets/scripts/modules/student/controllers/collections.js
sails/src/assets/scripts/modules/student/views/collections.html
sails/src/assets/scripts/modules/student/controllers/collections.js
View file @
9af2cee6
...
...
@@ -514,7 +514,7 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
//
// Adds a new pictogram
//
$scope
.
open_add
=
function
(
col
,
row
)
{
$scope
.
open_add
=
function
(
col
,
row
,
mainCatGrid
)
{
var
modalInstance
=
$modal
.
open
({
animation
:
true
,
templateUrl
:
'modules/student/views/addpicto.html'
,
...
...
@@ -542,7 +542,7 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
// Send the picto to the server
$http
.
post
(
config
.
backend
+
'/stu/'
+
$scope
.
studentData
.
id
+
'/picto/'
+
pictoId
,
{
attributes
:
{
id_cat
:
$scope
.
showFreeCategory
?
null
:
$scope
.
getCategoryId
(
$scope
.
selectedCategory
),
id_cat
:
(
$scope
.
showFreeCategory
||
mainCatGrid
)
?
null
:
$scope
.
getCategoryId
(
$scope
.
selectedCategory
),
coord_x
:
$scope
.
showFreeCategory
?
null
:
col
,
coord_y
:
$scope
.
showFreeCategory
?
null
:
row
,
status
:
'enabled'
,
...
...
sails/src/assets/scripts/modules/student/views/collections.html
View file @
9af2cee6
...
...
@@ -67,7 +67,7 @@
class=
"picto_options"
ng-if=
"studentPicto == emptyStudentPicto"
>
<a
ng-click=
"open_add(rowIndex, colIndex)"
ng-click=
"open_add(rowIndex, colIndex
, true
)"
class=
"picto_add"
title=
"{{ 'add_picto' | translate}}"
>
<i
class=
"color_green glyphicon glyphicon-plus-sign"
aria-hidden=
"true"
></i>
...
...
@@ -154,7 +154,7 @@
class=
"picto_options"
ng-if=
"studentPicto == emptyStudentPicto"
>
<a
ng-click=
"open_add(rowIndex, colIndex)"
ng-click=
"open_add(rowIndex, colIndex
, true
)"
class=
"picto_add"
title=
"{{ 'add_picto' | translate}}"
>
<i
class=
"color_green glyphicon glyphicon-plus-sign"
aria-hidden=
"true"
></i>
...
...
@@ -275,7 +275,7 @@
class=
"picto_options"
ng-if=
"studentPicto == emptyStudentPicto"
>
<a
ng-click=
"open_add(rowIndex, colIndex)"
ng-click=
"open_add(rowIndex, colIndex
, false
)"
class=
"picto_add"
title=
"{{ 'add_picto' | translate}}"
>
<i
class=
"color_green glyphicon glyphicon-plus-sign"
aria-hidden=
"true"
></i>
...
...
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