Skip to content

yotta / pictogram

Go to a project
Commit 3a6eb881 by Fernando Martínez Santiago
Options

Merge branch 'master' of http://scm.ujaen.es/softuno/pictogram

parents e4c6ae77 21fc48ba
Inline Side-by-side
Showing with 173 additions and 64 deletions
sails/conf/pictodb-data.sql
......@@ -95,11 +95,11 @@ INSERT INTO `picto_core_cat` (`id`, `id_pic`, `id_cat_pic`, `coord_x`, `coord_y`
(189, 2278,NULL, 0, 8, NULL), -- ok
(8, 4436, NULL, 1, 3, '#2E9AFE'), -- Pronouns
(9, 7515, NULL, 1, 4, '#008000'), -- People
(10, 7265, NULL, 1, 5, '#008000'), -- Kinship
(10, 10361, NULL, 1, 5, '#008000'), -- Kinship
(11, 50388, NULL, 1, 6, '#008000'), -- Professions
(125, 376, NULL, 2, 2, '#FF0000'), -- Desiring
(12, 265, NULL, 2, 3, '#FF0000'), -- Possession
(13, 50391, NULL, 2, 4, '#FF0000'), -- Ingestion
(13, 22, NULL, 2, 4, '#FF0000'), -- Ingestion
(14, 4967, NULL, 2, 5, '#FF0000'), -- Senses
(126, 2640, NULL, 2, 6, '#FF0000'), -- Roles
(127, 54270, NULL, 2, 7, '#FF0000'), -- Change
......@@ -120,14 +120,14 @@ INSERT INTO `picto_core_cat` (`id`, `id_pic`, `id_cat_pic`, `coord_x`, `coord_y`
(156, 5393, NULL, 4, 0, '#F4FA58'), -- Furniture
(157, 11368,NULL, 4, 1, '#F4FA58'), -- Kitchen items
(159, 2547,NULL, 4, 9, '#2E9AFE'), -- Articles and determinants
(190, 4721,NULL, 4, 7, '#F4FA58'), -- Body parts
(190, 4724,NULL, 4, 7, '#F4FA58'), -- Body parts
(191, 50956,NULL, 4, 8, '#F4FA58'), -- Stuff
(192, 51336,NULL, 1, 7, '#008000'), -- Animals_and_plants
(25, 676, 376, 2, 2, NULL), -- Desiring.want
(26, 292, 2640, 2, 7, NULL), -- Roles.be
(27, 265, 265, 2, 3, NULL), -- Possession.have
(27, 277, 265, 2, 3, NULL), -- Possession.have
(28, 9907, 2640, 2, 6, NULL), -- Roles.play
(29, 253, 253, 2, 8, NULL), -- Motion.go
(29, 485, 253, 2, 8, NULL), -- Motion.go
(30, 49839, 609, 3, 2, NULL), -- Tastes.stink
(31, 2718, 609, 3, 3, NULL), -- Tastes.spicy
(32, 3753, 609, 3, 4, NULL), -- Tastes.hot
......@@ -164,16 +164,16 @@ INSERT INTO `picto_core_cat` (`id`, `id_pic`, `id_cat_pic`, `coord_x`, `coord_y`
(63, 49835, 4967, 2, 4, NULL), -- Senses.smell
(64, 493, 4967, 2, 5, NULL), -- Senses.see
(65, 333, 4967, 2, 6, NULL), -- Senses.hear
(66, 609, 4967, 2, 7, NULL), -- Senses.taste
(66, 610, 4967, 2, 7, NULL), -- Senses.taste
(67, 2559, 5866, 3, 3, NULL), -- Sizes.big
(68, 2870, 5866, 3, 4, NULL), -- Sizes.small
(69, 7287, 7265, 1, 3, NULL), -- Kinship.sister
(70, 7269, 7265, 1, 4, NULL), -- Kinship.brother
(71, 49287, 7265, 1, 5, NULL), -- Kinship.dad
(72, 7476, 7265, 1, 6, NULL), -- Kinship.mom
(73, 7348, 7265, 1, 7, NULL), -- Kinship.grandma
(74, 7350, 7265, 1, 8, NULL), -- Kinship.grandpa
(75, 7265, 7265, 1, 9, NULL), -- Kinship.family
(69, 7287, 10361, 1, 3, NULL), -- Kinship.sister
(70, 7269, 10361, 1, 4, NULL), -- Kinship.brother
(71, 49287, 10361, 1, 5, NULL), -- Kinship.dad
(72, 7476, 10361, 1, 6, NULL), -- Kinship.mom
(73, 7348, 10361, 1, 7, NULL), -- Kinship.grandma
(74, 7350, 10361, 1, 8, NULL), -- Kinship.grandpa
(75, 7265, 10361, 1, 9, NULL), -- Kinship.family
(76, 7329, 7515, 1, 2, NULL), -- People.girl
(77, 7136, 7515, 1, 3, NULL), -- People.boy
(78, 7188, 7515, 1, 4, NULL), -- People.children
......@@ -216,8 +216,8 @@ INSERT INTO `picto_core_cat` (`id`, `id_pic`, `id_cat_pic`, `coord_x`, `coord_y`
(110, 7658, 50388, 1, 6, NULL), -- Professions.teacher
(111, 7237, 50388, 1, 7, NULL), -- Professions.doctor
(112, 7500, 50388, 1, 8, NULL), -- Professions.nurse
(113, 170, 50391, 2, 3, NULL), -- Ingestion.drink
(114, 184, 50391, 2, 4, NULL), -- Ingestion.eat
(113, 170, 22, 2, 3, NULL), -- Ingestion.drink
(114, 184, 22, 2, 4, NULL), -- Ingestion.eat
(118, 51192, 52736, 4, 2, NULL), -- Drinks.juice
(119, 4164, 52736, 4, 3, NULL), -- Drinks.tea
(120, 51605, 52736, 4, 4, NULL), -- Drinks.water
......@@ -274,37 +274,37 @@ INSERT INTO `picto_core_cat` (`id`, `id_pic`, `id_cat_pic`, `coord_x`, `coord_y`
(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
(194, 4848,4687, 1, 2, NULL), -- Body parts.hair
(195, 4872,4687, 1, 3, NULL), -- Body parts.head
(196, 50694,4687, 1, 4, NULL), -- Body parts.eye
(197, 4787 ,4687, 1, 5, NULL), -- Body parts.ear
(198, 4933,4687, 1, 6, NULL), -- Body parts.nose
(199, 4921,4687, 1, 7, NULL), -- Body parts.mouth
(200, 5009,4687, 1, 8, NULL), -- Body parts.tooth
(201, 4752,4687, 1, 9, NULL), -- Body parts.cheek
(202, 4756,4687, 2, 1, NULL), -- Body parts.chin
(203, 4929,4687, 2, 2, NULL), -- Body parts.neck
(204, 4974,4687, 2, 3, NULL), -- Body parts.shoulder
(205, 4754,4687, 2, 4, NULL), -- Body parts.chest
(206, 4997 ,4687, 2, 5, NULL), -- Body parts.stomatch
(207, 4699,4687, 2, 6, NULL), -- Body parts.back
(208, 4739 ,4687, 2, 7, NULL), -- Body parts.bottom
(209, 4689,4687, 2, 8, NULL), -- Body parts.arm
(210, 4795,4687, 2, 9, NULL), -- Body parts.elbow
(211, 5053,4687, 3, 2, NULL), -- Body parts.wrist
(212, 4868,4687, 3, 3, NULL), -- Body parts.hand
(213, 4820,4687, 3, 4, NULL), -- Body parts.finger
(214, 4821,4687, 3, 5, NULL), -- Body parts.nail
(215, 4903,4687, 3, 6, NULL), -- Body parts.leg
(216, 4898,4687, 3, 7, NULL), -- Body parts.knee
(217, 4687,4687, 3, 8, NULL), -- Body parts.ankle
(218, 4829,4687, 3, 9, NULL), -- Body parts.foot
(194, 4848,4724, 1, 2, NULL), -- Body parts.hair
(195, 4872,4724, 1, 3, NULL), -- Body parts.head
(196, 50694,4724, 1, 4, NULL), -- Body parts.eye
(197, 4787 ,4724, 1, 5, NULL), -- Body parts.ear
(198, 4933,4724, 1, 6, NULL), -- Body parts.nose
(199, 4921,4724, 1, 7, NULL), -- Body parts.mouth
(200, 5009,4724, 1, 8, NULL), -- Body parts.tooth
(201, 4752,4724, 1, 9, NULL), -- Body parts.cheek
(202, 4756,4724, 2, 1, NULL), -- Body parts.chin
(203, 4929,4724, 2, 2, NULL), -- Body parts.neck
(204, 4974,4724, 2, 3, NULL), -- Body parts.shoulder
(205, 4754,4724, 2, 4, NULL), -- Body parts.chest
(206, 4997 ,4724, 2, 5, NULL), -- Body parts.stomatch
(207, 4699,4724, 2, 6, NULL), -- Body parts.back
(208, 4739 ,4724, 2, 7, NULL), -- Body parts.bottom
(209, 4689,4724, 2, 8, NULL), -- Body parts.arm
(210, 4795,4724, 2, 9, NULL), -- Body parts.elbow
(211, 5053,4724, 3, 2, NULL), -- Body parts.wrist
(212, 4868,4724, 3, 3, NULL), -- Body parts.hand
(213, 4820,4724, 3, 4, NULL), -- Body parts.finger
(214, 4821,4724, 3, 5, NULL), -- Body parts.nail
(215, 4903,4724, 3, 6, NULL), -- Body parts.leg
(216, 4898,4724, 3, 7, NULL), -- Body parts.knee
(217, 4687,4724, 3, 8, NULL), -- Body parts.ankle
(218, 4829,4724, 3, 9, NULL), -- Body parts.foot
(219, 992,51336, 1, 7, NULL), -- Animals_and_plants.dog
(220, 1206,51336, 1, 8, NULL), -- Animals_and_plants.cat
(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, 50956,50956, 4, 8, '#F4FA58'); -- Stuff.stuff
(224, 4491,50956, 4, 8, '#F4FA58'); -- Stuff.stuff
......@@ -347,9 +347,9 @@ UPDATE picto_exp SET text='Pronombres' WHERE id_pic=4436 and lang='es-es';
UPDATE picto_exp SET text='People ' WHERE id_pic=7515 and lang='en-us';
UPDATE picto_exp SET text='People ' WHERE id_pic=7515 and lang='en-gb';
UPDATE picto_exp SET text='Gente' WHERE id_pic=7515 and lang='es-es';
UPDATE picto_exp SET text='Kinship' WHERE id_pic=7265 and lang='en-us';
UPDATE picto_exp SET text='Kinship' WHERE id_pic=7265 and lang='en-gb';
UPDATE picto_exp SET text='Familia' WHERE id_pic=7265 and lang='es-es';
UPDATE picto_exp SET text='Kinship' WHERE id_pic=10361 and lang='en-us';
UPDATE picto_exp SET text='Kinship' WHERE id_pic=10361 and lang='en-gb';
UPDATE picto_exp SET text='Familia' WHERE id_pic=10361 and lang='es-es';
UPDATE picto_exp SET text='Professions' WHERE id_pic=50388 and lang='en-us';
UPDATE picto_exp SET text='Professions' WHERE id_pic=50388 and lang='en-gb';
UPDATE picto_exp SET text='Profesiones' WHERE id_pic=50388 and lang='es-es';
......@@ -359,9 +359,9 @@ UPDATE picto_exp SET text='Desear' WHERE id_pic=376 and lang='es-es';
UPDATE picto_exp SET text='Possession' WHERE id_pic=265 and lang='en-us';
UPDATE picto_exp SET text='Possession' WHERE id_pic=265 and lang='en-gb';
UPDATE picto_exp SET text='Posesión' WHERE id_pic=265 and lang='es-es';
UPDATE picto_exp SET text='Ingestion' WHERE id_pic=50391 and lang='en-us';
UPDATE picto_exp SET text='Ingestion' WHERE id_pic=50391 and lang='en-gb';
UPDATE picto_exp SET text='Ingerir' WHERE id_pic=50391 and lang='es-es';
UPDATE picto_exp SET text='Ingestion' WHERE id_pic=22 and lang='en-us';
UPDATE picto_exp SET text='Ingestion' WHERE id_pic=22 and lang='en-gb';
UPDATE picto_exp SET text='Ingerir' WHERE id_pic=22 and lang='es-es';
UPDATE picto_exp SET text='Sense' WHERE id_pic=4967 and lang='en-us';
UPDATE picto_exp SET text='Sense' WHERE id_pic=4967 and lang='en-gb';
UPDATE picto_exp SET text='Sentir' WHERE id_pic=4967 and lang='es-es';
......@@ -428,15 +428,15 @@ UPDATE picto_exp SET text='querer' WHERE id_pic=676 and lang='es-es';
UPDATE picto_exp SET text='be' WHERE id_pic=292 and lang='en-us';
UPDATE picto_exp SET text='be' WHERE id_pic=292 and lang='en-gb';
UPDATE picto_exp SET text='ser' WHERE id_pic=292 and lang='es-es';
UPDATE picto_exp SET text='have' WHERE id_pic=265 and lang='en-us';
UPDATE picto_exp SET text='have' WHERE id_pic=265 and lang='en-gb';
UPDATE picto_exp SET text='have' WHERE id_pic=277 and lang='en-us';
UPDATE picto_exp SET text='have' WHERE id_pic=277 and lang='en-gb';
UPDATE picto_exp SET text='tener' WHERE id_pic=265 and lang='es-es';
UPDATE picto_exp SET text='play' WHERE id_pic=9907 and lang='en-us';
UPDATE picto_exp SET text='play' WHERE id_pic=9907 and lang='en-gb';
UPDATE picto_exp SET text='jugar' WHERE id_pic=9907 and lang='es-es';
UPDATE picto_exp SET text='go' WHERE id_pic=253 and lang='en-us';
UPDATE picto_exp SET text='go' WHERE id_pic=253 and lang='en-gb';
UPDATE picto_exp SET text='ir' WHERE id_pic=253 and lang='es-es';
UPDATE picto_exp SET text='go' WHERE id_pic=485 and lang='en-us';
UPDATE picto_exp SET text='go' WHERE id_pic=485 and lang='en-gb';
UPDATE picto_exp SET text='ir' WHERE id_pic=485 and lang='es-es';
UPDATE picto_exp SET text='stink' WHERE id_pic=49839 and lang='en-us';
UPDATE picto_exp SET text='stink' WHERE id_pic=49839 and lang='en-gb';
UPDATE picto_exp SET text='hediondo' WHERE id_pic=49839 and lang='es-es';
......@@ -545,9 +545,9 @@ UPDATE picto_exp SET text='ver' WHERE id_pic=493 and lang='es-es';
UPDATE picto_exp SET text='hear' WHERE id_pic=333 and lang='en-us';
UPDATE picto_exp SET text='hear' WHERE id_pic=333 and lang='en-gb';
UPDATE picto_exp SET text='oir' WHERE id_pic=333 and lang='es-es';
UPDATE picto_exp SET text='taste' WHERE id_pic=609 and lang='en-us';
UPDATE picto_exp SET text='taste' WHERE id_pic=609 and lang='en-gb';
UPDATE picto_exp SET text='sabor' WHERE id_pic=609 and lang='es-es';
UPDATE picto_exp SET text='taste' WHERE id_pic=610 and lang='en-us';
UPDATE picto_exp SET text='taste' WHERE id_pic=610 and lang='en-gb';
UPDATE picto_exp SET text='sabor' WHERE id_pic=610 and lang='es-es';
UPDATE picto_exp SET text='big' WHERE id_pic=2559 and lang='en-us';
UPDATE picto_exp SET text='big' WHERE id_pic=2559 and lang='en-gb';
UPDATE picto_exp SET text='grande' WHERE id_pic=2559 and lang='es-es';
......@@ -872,12 +872,15 @@ UPDATE picto_exp SET text='encender' WHERE id_pic=325 and lang='es-es';
UPDATE picto_exp SET text='turn off' WHERE id_pic=328 and lang='en-us';
UPDATE picto_exp SET text='turn off' WHERE id_pic=328 and lang='en-gb';
UPDATE picto_exp SET text='apagar' WHERE id_pic=328 and lang='es-es';
UPDATE picto_exp SET text='Body' WHERE id_pic=4721 and lang='en-us';
UPDATE picto_exp SET text='Body' WHERE id_pic=4721 and lang='en-gb';
UPDATE picto_exp SET text='Cuerpo' WHERE id_pic=4721 and lang='es-es';
UPDATE picto_exp SET text='Body' WHERE id_pic=4724 and lang='en-us';
UPDATE picto_exp SET text='Body' WHERE id_pic=4724 and lang='en-gb';
UPDATE picto_exp SET text='Cuerpo' WHERE id_pic=4724 and lang='es-es';
UPDATE picto_exp SET text='Stuff' WHERE id_pic=50956 and lang='en-us';
UPDATE picto_exp SET text='Stuff' WHERE id_pic=50956 and lang='en-gb';
UPDATE picto_exp SET text='Cosas' WHERE id_pic=50956 and lang='es-es';
UPDATE picto_exp SET text='stuff' WHERE id_pic=4491 and lang='en-us';
UPDATE picto_exp SET text='stuff' WHERE id_pic=4491 and lang='en-gb';
UPDATE picto_exp SET text='cosas' WHERE id_pic=4491 and lang='es-es';
UPDATE picto_exp SET text='Animals and plants' WHERE id_pic=51336 and lang='en-us';
UPDATE picto_exp SET text='Animals and plants' WHERE id_pic=51336 and lang='en-gb';
UPDATE picto_exp SET text='Animales y plantas' WHERE id_pic=51336 and lang='es-es';
......
sails/conf/pictodb.sql
......@@ -389,7 +389,8 @@ CREATE TABLE IF NOT EXISTS `stu_picto` (
`attributes` varchar(1000) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'JSON object describing the properties of the picto according to the properties defined in meta_picto',
PRIMARY KEY (`id`),
KEY `fk_picto` (`id_pic`),
KEY `id_stu` (`id_stu`)
KEY `id_stu` (`id_stu`),
UNIQUE `uq_stupicto` (`id_stu`,`id_pic`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
-- --------------------------------------------------------
......
sails/src/api/controllers/StudentController.js
......@@ -571,7 +571,7 @@ module.exports = {
return res.json(500, {error: 'Not updated picto for student'});
}
if (updated) {
console.log("Updated attributes for picto student" );
console.log("Updated attributes for picto student:"+JSON.stringify(updated[0]));
return res.json(updated[0]);
}
});
......@@ -800,13 +800,14 @@ module.exports = {
var params = req.allParams();
var count = 0;
sails.log.debug("Inside actions_batch");
sails.log.debug("Actions_batch request");
if (!params.actions)
return res.json(400, {'error': "no actions"});
// We loop through the actions and store them in the database
async.forEach(params.actions, function(action, cb){
sails.log.debug("Actions batch is recording action: "+JSON.stringify(action));
var id_dev = null;
if (action.attributes.id_dev)
id_dev = action.attributes.id_dev;
......
sails/src/assets/app/modules/student/controllers/session.js
......@@ -267,7 +267,7 @@ dashboardControllers.controller('StudentSessionCtrl', function StudentSessionCtr
$scope.stop_ws = function (){
// For view
$scope.sessionRunning = false;
$scope.wsessions[$scope.wsessions.length-1].tries.pop();
if ($scope.wsessions.length>0) $scope.wsessions[$scope.wsessions.length-1].tries.pop();
$scope.ws.end = new Date();
$http
......@@ -736,6 +736,9 @@ dashboardControllers.controller('StudentSessionCtrl', function StudentSessionCtr
//
// websockets events handling (Dashboard)
//
// Remove all listeners to this event
io.socket.off('action');
......
sails/src/assets/app/modules/student/controllers/student.js
......@@ -247,10 +247,25 @@ dashboardControllers.controller('StudentCtrl', function StudentCtrl($scope, conf
//
// WebSockets communication
//
io.socket.on('reconnect', function () {
// Subscribe to student's socket room
console.log("reconnecting to socket");
io.socket.post('/stu/subscribe', {
action: 'subscribe',
attributes:{
id_stu: $scope.studentData.id
},
token: $window.sessionStorage.token
},
function(res) {
console.log("Connected to student: " + res.msg);
});
});
/*
// Events handling
io.socket.on('action', function(data) {
console.log('"action" event received with the following data:');
console.log(data.msg);
});*/
});
\ No newline at end of file
});
sails/src/config/local.js~ 0 → 100644
//// template file for sails/src/config/local.js
/**
* Local environment settings
*
* Use this file to specify configuration settings for use while developing
* the app on your personal system: for example, this would be a good place
* to store database or email passwords that apply only to you, and shouldn't
* be shared with others in your organization.
*
* These settings take precedence over all other config files, including those
* in the env/ subfolder.
*
* PLEASE NOTE:
* local.js is included in your .gitignore, so if you're using git
* as a version control solution for your Sails app, keep in mind that
* this file won't be committed to your repository!
*
* Good news is, that means you can specify configuration for your local
* machine in this file without inadvertently committing personal information
* (like database passwords) to the repo. Plus, this prevents other members
* of your team from commiting their local configuration changes on top of yours.
*
* In a production environment, you probably want to leave this file out
* entirely and leave all your settings in env/production.js
*
*
* For more information, check out:
* http://sailsjs.org/#!/documentation/anatomy/myApp/config/local.js.html
*/
module.exports = {
/***************************************************************************
* Your SSL certificate and key, if you want to be able to serve HTTP *
* responses over https:// and/or use websockets over the wss:// protocol *
* (recommended for HTTP, strongly encouraged for WebSockets) *
* *
* In this example, we'll assume you created a folder in your project, *
* `config/ssl` and dumped your certificate/key files there: *
***************************************************************************/
ssl: {
ca: require('fs').readFileSync(__dirname + '/ssl/godaddy/gd.yottacode.com.bundle.crt'),
key: require('fs').readFileSync(__dirname + '/ssl/godaddy/gd.yottacode.com.key'),
cert: require('fs').readFileSync(__dirname + '/ssl/godaddy/gd.yottacode.com.crt')
},
/***************************************************************************
* The `port` setting determines which TCP port your app will be *
* deployed on. *
* *
* Ports are a transport-layer concept designed to allow many different *
* networking applications run at the same time on a single computer. *
* More about ports: *
* http://en.wikipedia.org/wiki/Port_(computer_networking) *
* *
* By default, if it's set, Sails uses the `PORT` environment variable. *
* Otherwise it falls back to port 1337. *
* *
* In env/production.js, you'll probably want to change this setting *
* to 80 (http://) or 443 (https://) if you have an SSL certificate *
***************************************************************************/
port: process.env.PORT || 1337,
/***************************************************************************
* The runtime "environment" of your Sails app is either typically *
* 'development' or 'production'. *
* *
* In development, your Sails app will go out of its way to help you *
* (for instance you will receive more descriptive error and *
* debugging output) *
* *
* In production, Sails configures itself (and its dependencies) to *
* optimize performance. You should always put your app in production mode *
* before you deploy it to a server. This helps ensure that your Sails *
* app remains stable, performant, and scalable. *
* *
* By default, Sails sets its environment using the `NODE_ENV` environment *
* variable. If NODE_ENV is not set, Sails will run in the *
* 'development' environment. *
***************************************************************************/
// environment: process.env.NODE_ENV || 'development'
};
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