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
ca165925
authored
Sep 29, 2017
by
Arturo Montejo Ráez
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
one picto delivery option added
parent
be6ea069
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
0 deletions
sails/src/api/models/Student.js
sails/src/assets/app/i18n/en-gb.json
sails/src/assets/app/i18n/es-es.json
sails/src/assets/scripts/modules/student/views/setup.html
sails/src/api/models/Student.js
View file @
ca165925
...
@@ -162,6 +162,11 @@ module.exports = {
...
@@ -162,6 +162,11 @@ module.exports = {
* picto_background: [#0000ff] Can be any valid HEX color. May be overriden by the
* picto_background: [#0000ff] Can be any valid HEX color. May be overriden by the
* category color
* category color
* tape_background: [#ff0000] Can be any valid HEX color
* tape_background: [#ff0000] Can be any valid HEX color
* one_picto_delivery: [true]/false
* delivery: 0
* // 0 -> delete strip after delivery
// 1 -> keep strip and on delivery
// 2 --> keep strip and several deliveries
*
*
* @TODO develop tts_engine, tts_voice and tts_options functionality
* @TODO develop tts_engine, tts_voice and tts_options functionality
* @TODO discuss about picto_select
* @TODO discuss about picto_select
...
@@ -193,6 +198,7 @@ module.exports = {
...
@@ -193,6 +198,7 @@ module.exports = {
size
:
'large'
,
size
:
'large'
,
picto_background
:
'#0000ff'
,
picto_background
:
'#0000ff'
,
tape_background
:
'#00ffff'
,
tape_background
:
'#00ffff'
,
one_picto_delivery
:
false
,
delivery
:
0
delivery
:
0
// 0 -> delete strip after delivery
// 0 -> delete strip after delivery
// 1 -> keep strip and on delivery
// 1 -> keep strip and on delivery
...
@@ -238,6 +244,9 @@ module.exports = {
...
@@ -238,6 +244,9 @@ module.exports = {
delete
validAttributes
.
delivery
;
delete
validAttributes
.
delivery
;
}
}
}
}
if
(
typeof
validAttributes
.
one_picto_delivery
!==
'boolean'
)
{
delete
validAttributes
.
one_picto_delivery
;
}
if
(
!
((
/^
(
small|normal|large
)
$/
).
test
(
validAttributes
.
legend_size
)))
{
if
(
!
((
/^
(
small|normal|large
)
$/
).
test
(
validAttributes
.
legend_size
)))
{
delete
validAttributes
.
legend_size
;
delete
validAttributes
.
legend_size
;
}
}
...
...
sails/src/assets/app/i18n/en-gb.json
View file @
ca165925
...
@@ -299,6 +299,7 @@
...
@@ -299,6 +299,7 @@
"office_not_updated"
:
"Office not updated"
,
"office_not_updated"
:
"Office not updated"
,
"office_updated"
:
"Office updated"
,
"office_updated"
:
"Office updated"
,
"offices"
:
"Offices"
,
"offices"
:
"Offices"
,
"one_picto_delivery"
:
"Perform delivery on one pictogram selection"
,
"options"
:
"Options"
,
"options"
:
"Options"
,
"or"
:
"or"
,
"or"
:
"or"
,
"own_instructions"
:
"Own method templates"
,
"own_instructions"
:
"Own method templates"
,
...
...
sails/src/assets/app/i18n/es-es.json
View file @
ca165925
...
@@ -297,6 +297,7 @@
...
@@ -297,6 +297,7 @@
"office_not_updated"
:
"El gabinete no se ha podido actualizar"
,
"office_not_updated"
:
"El gabinete no se ha podido actualizar"
,
"office_updated"
:
"Gabinete actualizado"
,
"office_updated"
:
"Gabinete actualizado"
,
"offices"
:
"Gabinetes"
,
"offices"
:
"Gabinetes"
,
"one_picto_delivery"
:
"Realizar entrega al seleccionar un pictograma"
,
"options"
:
"Opciones"
,
"options"
:
"Opciones"
,
"or"
:
"o"
,
"or"
:
"o"
,
"own_instructions"
:
"Plantillas de métodos propias"
,
"own_instructions"
:
"Plantillas de métodos propias"
,
...
...
sails/src/assets/scripts/modules/student/views/setup.html
View file @
ca165925
...
@@ -319,6 +319,17 @@
...
@@ -319,6 +319,17 @@
{{ 'keep_strip_and_deliveries' | translate }}
{{ 'keep_strip_and_deliveries' | translate }}
</span>
</span>
</div>
</div>
<div
class=
"input-group"
>
<span
class=
"input-group-addon"
>
<input
type=
"checkbox"
id=
"onePictoDelivery"
ng-model=
"studentData.attributes.one_picto_delivery"
ng-change=
"update_attributes()"
>
</span>
<span
class=
"form-control"
for=
"onePictoDelivery"
>
{{ 'one_picto_delivery' | translate }}
</span>
</div>
</fieldset>
</fieldset>
<div
class=
"alert alert-warning"
role=
"alert"
>
<div
class=
"alert alert-warning"
role=
"alert"
>
<p>
<p>
...
...
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