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
089dbfaf
authored
Dec 08, 2016
by
Arturo Montejo Ráez
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
issue #654 implemented, waiting for validation
parent
aa9d9dae
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
sails/src/api/models/Student.js
sails/src/assets/scripts/modules/student/views/setup.html
sails/src/api/models/Student.js
View file @
089dbfaf
...
...
@@ -157,8 +157,8 @@ module.exports = {
categories
:
true
,
input_feedback
:
{
vibration
:
true
,
click
:
false
,
read
:
false
,
beep
:
false
,
highlight
:
false
,
},
input_selection
:
{
...
...
@@ -189,7 +189,7 @@ module.exports = {
if
(
typeof
validAttributes
.
input_feedback
!==
'object'
)
{
delete
validAttributes
.
input_feedback
;
}
else
{
[
'vibration'
,
'
click'
,
'read'
,
'highlight
'
].
forEach
((
attribute
)
=>
{
[
'vibration'
,
'
read'
,
'highlight'
,
'beep
'
].
forEach
((
attribute
)
=>
{
if
(
typeof
validAttributes
.
input_feedback
[
attribute
]
!==
'boolean'
)
{
delete
validAttributes
.
input_feedback
[
attribute
];
}
...
...
sails/src/assets/scripts/modules/student/views/setup.html
View file @
089dbfaf
...
...
@@ -213,7 +213,6 @@
</div>
</div>
</fieldset>
<!-- DISABLED, NOT IMPLEMENTED YET
<fieldset>
<legend>
{{ 'feedback_picto' | translate }}
</legend>
<div
class=
"input-group"
>
...
...
@@ -228,11 +227,11 @@
<div
class=
"input-group"
>
<span
class=
"input-group-addon"
>
<input
type=
"checkbox"
id="studentSetup
Click
OnTouch"
ng-model="studentData.attributes.input_feedback.
click
"
id=
"studentSetup
Beep
OnTouch"
ng-model=
"studentData.attributes.input_feedback.
beep
"
ng-change=
"update_attributes()"
>
</span>
<label class="form-control" for="studentSetup
ClickOnTouch">{{ 'click
' | translate }}</label>
<label
class=
"form-control"
for=
"studentSetup
BeepOnTouch"
>
{{ 'beep
' | translate }}
</label>
</div>
<div
class=
"input-group"
>
<span
class=
"input-group-addon"
>
...
...
@@ -255,6 +254,7 @@
</label>
</div>
</fieldset>
<!-- DISABLED, NOT IMPLEMENTED YET
<fieldset>
<legend>{{ 'input_selection' | translate }}</legend>
<div class="input-group">
...
...
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