Skip to content

yotta / pictogram

Go to a project
Commit 089dbfaf by Arturo Montejo Ráez
Options

issue #654 implemented, waiting for validation

parent aa9d9dae
Inline Side-by-side
Showing with 6 additions and 6 deletions
sails/src/api/models/Student.js
...@@ -157,8 +157,8 @@ module.exports = { ...@@ -157,8 +157,8 @@ module.exports = {
categories: true, categories: true,
input_feedback: { input_feedback: {
vibration: true, vibration: true,
click: false,
read: false, read: false,
beep: false,
highlight: false, highlight: false,
}, },
input_selection: { input_selection: {
...@@ -189,7 +189,7 @@ module.exports = { ...@@ -189,7 +189,7 @@ module.exports = {
if (typeof validAttributes.input_feedback !== 'object') { if (typeof validAttributes.input_feedback !== 'object') {
delete validAttributes.input_feedback; delete validAttributes.input_feedback;
} else { } else {
['vibration', 'click', 'read', 'highlight'].forEach((attribute) => { ['vibration', 'read', 'highlight', 'beep'].forEach((attribute) => {
if (typeof validAttributes.input_feedback[attribute] !== 'boolean') { if (typeof validAttributes.input_feedback[attribute] !== 'boolean') {
delete validAttributes.input_feedback[attribute]; delete validAttributes.input_feedback[attribute];
} }
......
sails/src/assets/scripts/modules/student/views/setup.html
...@@ -213,7 +213,6 @@ ...@@ -213,7 +213,6 @@
</div> </div>
</div> </div>
</fieldset> </fieldset>
<!-- DISABLED, NOT IMPLEMENTED YET
<fieldset> <fieldset>
<legend>{{ 'feedback_picto' | translate }}</legend> <legend>{{ 'feedback_picto' | translate }}</legend>
<div class="input-group"> <div class="input-group">
...@@ -228,11 +227,11 @@ ...@@ -228,11 +227,11 @@
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"> <span class="input-group-addon">
<input type="checkbox" <input type="checkbox"
id="studentSetupClickOnTouch" id="studentSetupBeepOnTouch"
ng-model="studentData.attributes.input_feedback.click" ng-model="studentData.attributes.input_feedback.beep"
ng-change="update_attributes()"> ng-change="update_attributes()">
</span> </span>
<label class="form-control" for="studentSetupClickOnTouch">{{ 'click' | translate }}</label> <label class="form-control" for="studentSetupBeepOnTouch">{{ 'beep' | translate }}</label>
</div> </div>
<div class="input-group"> <div class="input-group">
<span class="input-group-addon"> <span class="input-group-addon">
...@@ -255,6 +254,7 @@ ...@@ -255,6 +254,7 @@
</label> </label>
</div> </div>
</fieldset> </fieldset>
<!-- DISABLED, NOT IMPLEMENTED YET
<fieldset> <fieldset>
<legend>{{ 'input_selection' | translate }}</legend> <legend>{{ 'input_selection' | translate }}</legend>
<div class="input-group"> <div class="input-group">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment