Skip to content

yotta / pictogram

Go to a project
Commit 01e39acb by Fernando Martínez Santiago
Options

working on issue #630, AngularJS side

parent 9d36dc9a
Inline Side-by-side
Showing with 45 additions and 19 deletions
android/Pictogram/tabletlibrary/.gitignore
/build
/tabletlibrary.iml
\ No newline at end of file
android/Pictogram/watch/.gitignore
/build
/watch.iml
\ No newline at end of file
sails/roles/database/files/pictodb-data.sql
......@@ -90,10 +90,13 @@ INSERT INTO `picto_core` (`id`, `id_pic`, `id_cat_pic`, `coord_x`, `coord_y`,`co
(155, 12303,NULL, 4, 1, '#F4FA58'), -- Clasroom items
(156, 5393, NULL, 4, 0, '#F4FA58'), -- Furniture
(157, 11368,NULL, 4, 2, '#F4FA58'), -- Kitchen items
(159, 2547,NULL, 4, 9, '#2E9AFE'), -- Articles and determinants
(159, 2547,NULL, 3, 9, '#2E9AFE'), -- Articles and determinants
(190, 4724,NULL, 4, 7, '#F4FA58'), -- Body parts
(191, 50956,NULL, 4, 8, '#F4FA58'), -- Stuff
(191, 50956,NULL, 4, 9, '#F4FA58'), -- Stuff
(192, 51336,NULL, 1, 7, '#008000'), -- Animals_and_plants
(193, 50956,NULL, 4, 8, '#F4FA58'), -- Stuff
(228, 56255,NULL, 3, 0, '#F4FA58'), -- Books, films and tv
(227, 56366,NULL, 4, 8, '#F4FA58'), -- Devices
(25, 676, 376, 2, 2, NULL), -- Desiring.want
(26, 292, 2640, 2, 7, NULL), -- Roles.be
(27, 277, 265, 2, 3, NULL), -- Possession.have
......@@ -231,17 +234,17 @@ INSERT INTO `picto_core` (`id`, `id_pic`, `id_cat_pic`, `coord_x`, `coord_y`,`co
(171, 11437, 5393, 4, 1, NULL), -- Furniture.sofa
(172, 11454, 5393, 4, 2, NULL), -- Furniture.table
(173, 5249, 5393, 4, 3, NULL), -- Furniture.bed
(174, 11039, 5393, 4, 4, NULL), -- Furniture.television
(175, 11387, 5393, 4, 5, NULL), -- Furniture.radio
(176, 11237, 5393, 4, 6, NULL), -- Furniture.console
(177, 49654, 5393, 4, 7, NULL), -- Furniture.tablet
(178, 9394, 5393, 4, 8, NULL), -- Furniture.computer
(174, 11039, 56366, 4, 4, NULL), -- Devices.television
(175, 11387, 56366, 4, 5, NULL), -- Devices.radio
(176, 11237, 56366, 4, 6, NULL), -- Devices.console
(177, 49654, 56366, 4, 7, NULL), -- Devices.tablet
(178, 9394, 56366, 4, 8, NULL), -- Devices.computer
(179, 1406, 50343, 2,8, NULL), -- Prepositions.of
(180, 1407, 50343, 2,9, NULL), -- Prepositions.in
(181, 102771, 2547, 4,5, NULL), -- Articles and determinants.a
(182, 2935, 2547, 4,6, NULL), -- Articles and determinants.the
(183, 2922, 2547, 4,7, NULL), -- Articles and determinants.these
(184, 2929, 2547, 4,8, NULL), -- Articles and determinants.those
(181, 102771, 2547, 3,5, NULL), -- Articles and determinants.a
(182, 2935, 2547, 3,6, NULL), -- Articles and determinants.the
(183, 2922, 2547, 3,7, NULL), -- Articles and determinants.these
(184, 2929, 2547, 3,8, NULL), -- Articles and determinants.those
(186, 325, 54270, 2, 6, NULL), -- Change.turn on
(187, 328, 54270, 2, 7, NULL), -- Change.turn off
(188, 52670, 52736, 4, 5, NULL), -- Drinks.milk
......@@ -275,7 +278,10 @@ INSERT INTO `picto_core` (`id`, `id_pic`, `id_cat_pic`, `coord_x`, `coord_y`,`co
(221, 853,51336, 1, 9, NULL), -- Animals_and_plants.bird
(222, 57236,51336, 1, 5, NULL), -- Animals_and_plants.tree
(223, 57384,51336, 1, 6, NULL), -- Animals_and_plants.plant
(224, 4491,50956, 4, 8, '#F4FA58'); -- Stuff.stuff
(224, 10921,56255, 3, 0, NULL), -- Books, TV and Films.Dibujos animados
(225, 10926,56255, 3, 1, NULL), -- Books, TV and Films.Film
(226, 10908,56255, 3, 2, NULL); -- Books, TV and Films.Book
......@@ -812,7 +818,7 @@ UPDATE picto_exp SET text='radio' WHERE id_pic=11387 and lang='en-gb';
UPDATE picto_exp SET text='radio' WHERE id_pic=11387 and lang='es-es';
UPDATE picto_exp SET text='console' WHERE id_pic=11237 and lang='en-us';
UPDATE picto_exp SET text='console' WHERE id_pic=11237 and lang='en-gb';
UPDATE picto_exp SET text='console' WHERE id_pic=11237 and lang='es-es';
UPDATE picto_exp SET text='consola' WHERE id_pic=11237 and lang='es-es';
UPDATE picto_exp SET text='tablet' WHERE id_pic=49654 and lang='en-us';
UPDATE picto_exp SET text='tablet' WHERE id_pic=49654 and lang='en-gb';
UPDATE picto_exp SET text='tablet' WHERE id_pic=49654 and lang='es-es';
......@@ -861,7 +867,21 @@ UPDATE picto_exp SET text='gato' WHERE id_pic=1206 and lang='es-es';
UPDATE picto_exp SET text='bird' WHERE id_pic=853 and lang='en-us';
UPDATE picto_exp SET text='bird' WHERE id_pic=853 and lang='en-gb';
UPDATE picto_exp SET text='pájaro' WHERE id_pic=853 and lang='es-es';
UPDATE picto_exp SET text='Books, TV and films' WHERE id_pic=56255 and lang='en-us';
UPDATE picto_exp SET text='Books, TV and films' WHERE id_pic=56255 and lang='en-gb';
UPDATE picto_exp SET text='Libros, TV y películas' WHERE id_pic=56255 and lang='es-es';
UPDATE picto_exp SET text='cartooms' WHERE id_pic=10921 and lang='en-us';
UPDATE picto_exp SET text='cartooms' WHERE id_pic=10921 and lang='en-gb';
UPDATE picto_exp SET text='dibujos animados' WHERE id_pic=10921 and lang='es-es';
UPDATE picto_exp SET text='TV' WHERE id_pic=10926 and lang='en-us';
UPDATE picto_exp SET text='TV' WHERE id_pic=10926 and lang='en-gb';
UPDATE picto_exp SET text='tele' WHERE id_pic=10926 and lang='es-es';
UPDATE picto_exp SET text='book' WHERE id_pic=10908 and lang='en-us';
UPDATE picto_exp SET text='book' WHERE id_pic=10908 and lang='en-gb';
UPDATE picto_exp SET text='libro' WHERE id_pic=10908 and lang='es-es';
UPDATE picto_exp SET text='Electronic devices' WHERE id_pic=56366 and lang='en-us';
UPDATE picto_exp SET text='Dispositivos electrónicos' WHERE id_pic=56366 and lang='en-gb';
UPDATE picto_exp SET text='Dispositivos electrónicos' WHERE id_pic=56366 and lang='es-es';
SET foreign_key_checks=1;
sails/src/api/models/StuPicto.js
......@@ -85,7 +85,8 @@ module.exports = {
free_category_coord_y: null,
status: 'invisible',
highlight: false,
color: null
color: null,
expression: null
};
if (typeof attributes === 'object') {
......
sails/src/assets/scripts/modules/student/views/pictoconfig.html
......@@ -11,12 +11,12 @@
<li class="list-group-item">
<p translate>expression</p>
<!-- Modificable sólo si es el propietario del picto -->
<form ng-submit="change()">
<form ng-submit="isOwner ? change() : update_properties()">
<div id="add_label" class="input-group">
<span class="input-group-addon glyphicon glyphicon-comment" aria-hidden="true"></span>
<input type="text" class="form-control" ng-model="expression" ng-readonly="{{!isOwner}}" />
<input type="text" class="form-control" ng-model="isOwner ? expression : studentPicto.attributes.expression" />
<span class="input-group-btn">
<button class="btn btn-success" type="submit" ng-disabled="{{!isOwner}}" translate>save</button>
<button class="btn btn-success" type="submit" translate>save</button>
</span>
</div>
</form>
......
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