issues #523 #525 #529 #594 fixed

sails/roles/database/files/pictodb-schema.sql

@@ -308,8 +308,7 @@ 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',
   `attributes` varchar(1000) COLLATE utf8_unicode_ci DEFAULT NULL COMMENT 'JSON object describing the properties of the picto',
   PRIMARY KEY (`id`),
   PRIMARY KEY (`id`),
   KEY `fk_picto` (`id_pic`),
   KEY `fk_picto` (`id_pic`),
-  KEY `id_stu` (`id_stu`),
-  UNIQUE `uq_stupicto` (`id_stu`,`id_pic`)
+  KEY `id_stu` (`id_stu`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1
 COMMENT="This table relates a student with the pictos in her vocabulary";
 COMMENT="This table relates a student with the pictos in her vocabulary";
 
 

sails/src/assets/app/i18n/en-gb.json

@@ -44,6 +44,7 @@
     "child": "Child",
     "child": "Child",
     "click": "Click",
     "click": "Click",
     "click_login": "Click to login",
     "click_login": "Click to login",
+    "click_to_edit": "clic to edit",
     "close": "Close",
     "close": "Close",
     "close_session": "Close session",
     "close_session": "Close session",
     "collections": "Collections",
     "collections": "Collections",

sails/src/assets/app/i18n/es-es.json

@@ -44,6 +44,7 @@
     "child": "Niño",
     "child": "Niño",
     "click": "Clic",
     "click": "Clic",
     "click_login": "Clic para iniciar sesión",
     "click_login": "Clic para iniciar sesión",
+    "click_to_edit": "clic para editar",
     "close": "Cerrar",
     "close": "Cerrar",
     "close_session": "Cerrar sesion",
     "close_session": "Cerrar sesion",
     "collections": "Colecciones",
     "collections": "Colecciones",

sails/src/assets/scripts/modules/student/controllers/instructions.js

@@ -77,7 +77,7 @@ dashboardControllers.controller('StudentInstructionsCtrl', function StudentInstr
       $http
       $http
         .post(config.backend+'/method/new', {
         .post(config.backend+'/method/new', {
           'id_stu': $scope.studentData.id,
           'id_stu': $scope.studentData.id,
-          'name': "Nuevo método (cambiar nombre)"
+          'name': $translate.instant("new_method") + "(" + $translate.instant("click_to_edit") + ")"
         })
         })
         .success(function(data, status, headers, config) {
         .success(function(data, status, headers, config) {
           // Add empty array of instructions
           // Add empty array of instructions
@@ -217,8 +217,13 @@ dashboardControllers.controller('StudentInstructionsCtrl', function StudentInstr
 
 
   // Add instruction
   // Add instruction
   $scope.add_instruction = function(method){
   $scope.add_instruction = function(method){
+    var data = {
+      method: method.id,
+      name: $translate.instant("new_instruction") + " (" + $translate.instant("click_to_edit") + ")",
+      objective: $translate.instant("new_objective") + " (" + $translate.instant("click_to_edit") + ")"
+    };
     $http
     $http
-      .post(config.backend+'/instruction', { method: method.id } )
+      .post(config.backend+'/instruction', data )
       .success(function(data, status, headers, config) {
       .success(function(data, status, headers, config) {
         console.log('Added instruction:' + JSON.stringify(data));
         console.log('Added instruction:' + JSON.stringify(data));
         // Add in view
         // Add in view