license on create student added

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

@@ -140,6 +140,7 @@ CREATE TABLE IF NOT EXISTS `office` (
   `name` varchar(80) COLLATE utf8_unicode_ci NOT NULL,
   `logo_url` varchar(240) COLLATE utf8_unicode_ci NOT NULL,
   `address` varchar(180) COLLATE utf8_unicode_ci NOT NULL,
+  `postal_code` char(10) COLLATE utf8_unicode_ci NOT NULL,
   `country` varchar(2) COLLATE utf8_unicode_ci NOT NULL,
   `lang` varchar(5) COLLATE utf8_unicode_ci NOT NULL,
   `contact_person` varchar(80) COLLATE utf8_unicode_ci NOT NULL COMMENT 'Contact person, main responsible',

sails/roles/database/files/test-autismojaen.sql

@@ -13,7 +13,8 @@ INSERT IGNORE INTO `office` (
   `contact_person`,
   `email`,
   `phone1`,
-  `lang`
+  `lang`,
+  `postal_code`
 ) VALUES (
   'Asociación Provincial de Autismo de Jaén',
   'Avd. de Andalucía, 92 - bajo, 23006 Jaén',
@@ -21,7 +22,8 @@ INSERT IGNORE INTO `office` (
   'Belén Pérez Vílchez',
   'belen.perez@autismojaen.es',
   '+34 953 236 158',
-  'es-es'
+  'es-es',
+  '23006'
 );
 
 --

sails/roles/database/files/test-caja.sql

@@ -14,7 +14,8 @@ INSERT INTO `office` (
   `contact_person`,
   `email`,
   `phone1`,
-  `lang`
+  `lang`,
+  `postal_code`
 ) VALUES (
   'Comunicación Aumentativa JAén (CAJA)',
   'Paraje Las Lagunillas, Ed A3, primera plata, 23071. Jaén',
@@ -22,7 +23,8 @@ INSERT INTO `office` (
   'Fernando Martínez Santiago',
   'dofer@ujaen.es',
   '+34 953 21 28 88',
-  'es-es'
+  'es-es',
+  '23071'
 );
 
 --

sails/roles/database/files/test-centrodestrezas.sql

@@ -5,7 +5,8 @@ INSERT IGNORE INTO `office` (
   `contact_person`,
   `email`,
   `phone1`,
-  `lang`
+  `lang`,
+  `postal_code`
 ) VALUES (
   'Centro Destrezas',
   'Avd. Eduardo García Maroto, 22, 1º Centro - Jaén',
@@ -13,7 +14,8 @@ INSERT IGNORE INTO `office` (
   'Centro Destrezas',
   'centrodestrezas@gmail.com',
   '+34 953 043 508',
-  'es-es'
+  'es-es',
+  '23007'
 );
 
 INSERT IGNORE INTO `supervisor` (

sails/src/api/controllers/StudentController.js

-<<<<<<< HEAD
 /* global Student, PictoCore, VStuLastInstruction, StuPicto, StuSup, sailsTokenAuth, sails,
    Picto */
 
@@ -56,12 +55,15 @@ module.exports = {
           if (bcrypt.compareSync(req.body.password, student.password)) {
             student.isStudent = true;
             student.license = student.license[0];
-            res.ok({
-              user: student,
-              token: sailsTokenAuth.issueToken(student, sails.config.jwt.expiresInMinutes),
-              server_time: (new Date())
-                .getTime()
-            });
+            if (!student.license || student.license.hasExpired()) {
+              sails.log.error(`Tried to login with non valid license ${req.body.username}`);
+              return res.badRequest("Student has an invalid license");
+            } else
+              return res.ok({
+                user: student,
+                token: sailsTokenAuth.issueToken(student, sails.config.jwt.expiresInMinutes),
+                server_time: (new Date()).getTime()
+              });
           } else {
             sails.log.error(`Invalid student login: user ${student.username}, password\
               "${req.body.password}"`);
@@ -127,7 +129,7 @@ module.exports = {
       // requester has no relation
       student.supervision = -1;
 
-      if (!stu_sup && req.token.office && student.office == req.token.office.id)
+      if (!stu_sup && req.token.office && student.office == req.token.office.id && req.token.isSupAdmin)
         student.supervision = 0; // requester is admin of the office
       else if (stu_sup && !req.token.office)
         student.supervision = 1; // requester is tutor of the studend
@@ -149,23 +151,34 @@ module.exports = {
   //
   create: function (req, res) {
     var params = req.params.all();
-    Student.create(params)
-    .then(function(created) {
-      sails.log.debug('Student ' + created.id + ' created: ' + JSON.stringify(created));
-      return res.ok(created);
-    })
-    .error(function(err) {
-      if (err.message.search("Maximum number of enrolments reached") > 0) {
-        // This is a MySQL error triggered by TRG_NEW_STUDENT_MAXENROLMENTS trigger
-        // (see triggers-enroments-integrity-constraints.sql)
-        // As the format is not that of a normal error, we just get message
-        sails.log.debug(err.message);
-        return res.serverError(err.message);
-      }
-      else {
-        sails.log.debug(err.message);
-        return res.serverError(err.message);
-      }
+    License.isActivable(params.license_number, function(err) {
+      if (err)
+        return res.serverError(err);
+
+      Student.create(params)
+      .then(function(created) {
+        sails.log.debug('Student ' + created.id + ' created: ' + JSON.stringify(created));
+        License.activate(params.license_number, created.id, function(err, license) {
+          if (err)
+            return res.serverError(err);
+          created = created.toObject();
+          created.license = license.toObject();
+          return res.ok(created);
+        });
+      })
+      .error(function(err) {
+        if (err.message.search("Maximum number of enrolments reached") > 0) {
+          // This is a MySQL error triggered by TRG_NEW_STUDENT_MAXENROLMENTS trigger
+          // (see triggers-enroments-integrity-constraints.sql)
+          // As the format is not that of a normal error, we just get message
+          sails.log.debug(err.message);
+          return res.serverError(err.message);
+        }
+        else {
+          sails.log.debug(err.message);
+          return res.serverError(err.message);
+        }
+      });
     });
   },
 
@@ -177,18 +190,11 @@ module.exports = {
    */
   delete: function (req, res) {
     if (!req.params.id_stu)
-      return res.json(500, {
-        error: 'No student defined'
-      });
+      return res.badRequest('No student defined');
     Student.logical_delete(req.params.id_stu, function (err) {
-      if (err) {
-        return res.json(500, {
-          error: err
-        });
-      }
-      return res.json({
-        result: 'Deleted'
-      });
+      if (err)
+        return res.serverError(err);
+      return res.ok({result: 'deleted'});
     });
   },
 
@@ -227,8 +233,14 @@ module.exports = {
       // delete license attribute as this has been already handled
       delete stu.license;
 
-      stu.save().then(function (saved) {
-        res.ok(saved);
+      // delete username, as this should never be updated from requests
+      delete stu.username;
+
+      stu.save(function (err) {
+        if (err)
+          throw err;
+
+        res.ok(stu);
 
         // Send websocket message
         sails.hooks.events.broadcastEvent(
@@ -236,9 +248,6 @@ module.exports = {
           sails.hooks.events.updateStudent(stu),
           (req.isSocket) ? req.socket : undefined
         );
-      })
-      .catch(function(err) {
-          res.severError();
       });
     })
     .catch(function (err) {

sails/src/api/controllers/SupervisorController.js

@@ -462,7 +462,7 @@ module.exports = {
      }
      Supervisor.students(req.params.id, function (err, stus) {
        if (err) throw err;
-       return res.json(stus);
+       return res.ok(stus);
      });
    },
 

sails/src/api/models/License.js

@@ -52,6 +52,9 @@ module.exports = {
       var l = this.toObject();
       delete l.id;
       return l;
+    },
+    hasExpired: function () {
+      return (new Date(this.expiration_ts) - new Date() < 0);
     }
   },
   /**
@@ -69,9 +72,9 @@ module.exports = {
     License.findOne({ number: number })
     .then((l) => {
       if (!l)
-        throw new Error("Invalid license");
+        throw new Error("Invalid license: " + number);
       if (l.activation_ts)
-        throw new Error("The license is already active");
+        throw new Error("License in use");
 
       // License ok, check student
       Student.findOne(id_stu)
@@ -113,5 +116,21 @@ module.exports = {
     .catch((err) => {
       callback(err, null);
     });
+  },
+
+  /**
+  * Determines whether a license is activable (available) or not
+  * Callback function gets instantiated error if not available
+  */
+  isActivable: function(number, cb) {
+    License.findOne({number: number})
+    .then ((l) => {
+      if (!l)
+        throw new Error('Invalid license');
+      if (l.activation_ts)
+        throw new Error('License in use');
+      cb();
+    })
+    .catch((err) => {cb(err)});
   }
 }

sails/src/api/models/Student.js

@@ -114,7 +114,8 @@ module.exports = {
     toJSON: function () {
       var student = this.toObject();
       student.pic = sails.config.pictogram.urls.getStudentAvatarUrl(student.pic);
-      student.license = student.license[0] ? student.license[0] : null;
+      if (student.license)
+        student.license = student.license[0] ? student.license[0] : null;
       student.attributes = Student.getValidAttributes(student.attributes);
       delete student.password;
       return student;
@@ -244,6 +245,7 @@ module.exports = {
   beforeCreate: function (attrs, next) {
     attrs.attributes = Student.getValidAttributes(attrs.attributes);
     attrs.password = bcrypt.hashSync(attrs.password, bcrypt.genSaltSync());
+    attrs.pic = "defaultAvatar.jpg";
     next();
   },
 
@@ -255,7 +257,6 @@ module.exports = {
    *                         to the function if necesary)
    */
   beforeUpdate: function (attrs, next) {
-    delete attrs.username;
     attrs.attributes = Student.getValidAttributes(attrs.attributes);
     if (attrs.password) {
       sails.log.debug('password changed');
@@ -512,13 +513,14 @@ module.exports = {
   logical_delete: function(id_stu, cb) {
     Student.findOne(id_stu).exec(function(err, student) {
       if (err || !student)
-        throw err;
-
-      student.office = null;
-      student.save(function(err, saved) {
-        if (err) return cb(err);
-        return cb();
-      });
+        return cb(new Error("Unable to remove student"));
+      Student.update(id_stu,
+        {
+          username: Math.floor((Math.random() * 100000000) + 1) + "_" + student.username,
+          id_off: null
+        })
+      .then((updated) => {cb()})
+      .catch((err) => {cb(err)});
     });
   }
 };

sails/src/api/models/Supervisor.js

@@ -209,6 +209,7 @@ module.exports = {
   },
 
   students: function(id, callback) {
+
     var l = [];
     Supervisor.findOne(id)
     .populate('office')
@@ -236,37 +237,45 @@ module.exports = {
         if (stuSup.student.office == null)
           next_cb();
 
-        var student = stuSup.student;
-        student.supervision = sup.office ? 2 : 1;
-
-        // set current methdo and instruction if any
-        student.current_method = "no_method";
-        student.current_instruction = "no_instruction";
-        VStuLastInstruction.findOne({student: student.id})
-        .then(function (stu_last_inst) {
-          if (stu_last_inst) {
-            student.current_method = stu_last_inst.met_name;
-            student.current_instruction = stu_last_inst.ins_name;
+        // set current method and instruction if any
+        Student.findOne(stuSup.student.id)
+        .populate('lastInstruction')
+        .populate('license')
+        .then(function (s) {
+          s.current_method = s.lastInstruction[0] ? s.lastInstruction[0].met_name : "no_method";
+          s.current_instruction = s.lastInstruction[0] ? s.lastInstruction[0].ins_name : "no_instruction";
+          if (typeof(s.license[0]) != 'undefined') {
+            s.licenseIsValid =  new Date(s.license[0].expiration_ts) - new Date() > 0 ? true : false;
+            s.license = s.license[0];
+          } else {
+            s.licenseIsValid = false;
+            s.license = null;
           }
-          l.push(student);
-          next_cb();
-        })
-        .error(err => {
-          l.push(student);
+          s.supervision = sup.office ? 2 : 1; // if Supervisor has office, then is a therapist (2), a tutor (1) otherwise
+          l.push(s);
           next_cb();
         });
       },
       function (err) { // loop has end
         // Get all students from the office if user is administrator
         if (sup.office && sup.office.admin == sup.id) {
-	  var officeStudents;
+	        var officeStudents;
 
-          Student.find({ office: sup.office.id }).populate('lastInstruction')
+          Student.find({ office: sup.office.id })
+          .populate('lastInstruction')
+          .populate('license')
           .then(function (officeStudents) {
             officeStudents = officeStudents.map((student) => {
-              student.supervision = student.supervision || 0;
+              student.supervision = 0;
               student.current_method = student.lastInstruction[0] ? student.lastInstruction[0].met_name : "no_method";
               student.current_instruction = student.lastInstruction[0] ? student.lastInstruction[0].ins_name : "no_instruction";
+              if (typeof(student.license[0]) != 'undefined') {
+                student.licenseIsValid = new Date(student.license[0].expiration_ts) - new Date() > 0 ? true : false;
+                student.license = student.license[0];
+              } else {
+                student.licenseIsValid = false;
+                student.license = null;
+              }
               return student;
             });
             l = l.concat(officeStudents);
@@ -275,9 +284,9 @@ module.exports = {
           .catch(function (err) {
             callback(err, l);
           });
-       } else {
-	callback(err, l);
-       }
+        } else {
+	        callback(err, l);
+        }
       }); // end async.eachSeries
     })
     .catch((err) => {

sails/src/api/policies/isSupervisorOfStudentOrIsSupAdmin.js

+/* global sails, Student */
+
+module.exports = function isSupervisorOfStudentOrIsSupAdmin(req, res, next) {
+  const supervisorId = req.token.id;
+  const studentId = req.params.id_stu;
+
+  if (!studentId || !supervisorId) {
+    sails.log.error('This request needs an id_stu parameter and a authenticated supervisor');
+    res.json(401, { error: 'Access denied' });
+  } else {
+    Student.findOne(studentId)
+    .then(function (s) {
+      if (s.office == req.token.office.id && req.token.isSupAdmin) {
+        next();
+      }
+      else {
+        Student.supervisors(studentId, function (err, sups) {
+          const studentSupervisorsIds = sups.map((studentSupervisor) => studentSupervisor.id);
+
+          if (err || studentSupervisorsIds.length === 0) {
+            sails.log.error(`Student ${studentId} has no supervisor assigned`);
+            res.json(401, { error: 'Access denied' });
+          } else if (studentSupervisorsIds.indexOf(supervisorId) < 0) {
+            sails.log.error(`Supervisor ${supervisorId} is not assigned to Student ${studentId}`);
+            sails.log.debug(`Student supervisors: ${studentSupervisorsIds}`);
+            res.json(401, { error: 'Access denied' });
+          } else {
+            sails.log.debug(`Supervisor ${supervisorId} is assigned to Student ${studentId}`);
+            next();
+          }
+        });
+      }
+    });
+  }
+};

sails/src/api/responses/serverError.js

@@ -24,7 +24,7 @@ module.exports = function serverError (data, options) {
 
   // Log error to console
   if (data !== undefined) {
-    sails.log.error('Sending 500 ("Server Error") response: \n',data);
+    sails.log.error('Sending 500 ("Server Error") response: \n', JSON.stringify(data));
   }
   else sails.log.error('Sending empty 500 ("Server Error") response');
 
@@ -74,4 +74,3 @@ module.exports = function serverError (data, options) {
   });
 
 };
-

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

@@ -139,6 +139,7 @@
     "license_already_activated": "License already activated",
     "license_created": "License created",
     "license_expires": "License expires on ",
+    "license_expired": "License expired on ",
     "license_invalid": "Invalid license number",
     "licenses_left": "{{number}} licenses left",
     "license_missing": "Account without license",
@@ -293,12 +294,12 @@
     "supervisor_not_updated": "Supervisor not updated",
     "supervisor_note": "If the parent aren't going to register in the platform, the administrator can use the notes field to store their information.",
     "supervisor_updated": "Supervisor updated",
-    "supervisors": "Therapist",
-    "supervisors_setup": "Supervisors",
+    "supervisors": "Supervisors",
     "surname": "Surname",
     "tag_deleted": "Tag deleted",
     "tape_background": "Tape background",
     "template_deleted": "Template deleted",
+    "therapists": "Therapists",
     "time_hours": "Time: {{hours}} hours",
     "time_instruction_method": "Time instructions of method",
     "time_sessions_total": "Total sessions time",

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

@@ -139,10 +139,11 @@
     "licenses_left": "{{number}} licencias disponibles",
     "license_already_activated": "Licencia ya activada previamente",
     "license_expires": "La licencia expira el ",
+    "license_expired": "La licencia expiró el ",
     "license_created": "Licencia creada",
     "license_invalid": "Licencia inválida",
     "license_number": "Número de licencia",
-    "license_missing": "Cuenta sin licencia",    
+    "license_missing": "Cuenta sin licencia",
     "light_up": "Iluminar",
     "link": "Vincular",
     "loading_pictos": "Cargando pictos",
@@ -294,8 +295,8 @@
     "supervisor_not_updated": "El supervisor no se ha podido actualizar",
     "supervisor_note": "Si los padres no se van a dar de alta en la plataforma nunca, el administrador puede anotar la información de contacto en el campo notas.",
     "supervisor_updated": "Supervisor actualizado",
-    "supervisors": "Terapeutas",
-    "supervisors_setup": "Supervisores",
+    "therapists": "Terapeutas",
+    "supervisors": "Supervisores",
     "surname": "Apellidos",
     "tag_deleted": "Etiqueta borrada",
     "tape_background": "Fondo de la cinta",

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

@@ -125,10 +125,7 @@ dashboardControllers.controller('StudentSetupCtrl', function StudentSetupCtrl(
       $scope.formUser.username = data.username;
       $scope.formUser.license_number = data.license ? data.license.number : '';
       $scope.studentData.license = data.license ? data.license : null;
-      if (data.license) {
-        moment.locale($translate.use().substr(0, 2));
-        $scope.expiration_date = moment($scope.studentData.license.expiration_ts).format('L');
-      }
+      $scope.updateLicenseExpiration();
 
       // websocket emit update action
       delete data.license;
@@ -141,7 +138,7 @@ dashboardControllers.controller('StudentSetupCtrl', function StudentSetupCtrl(
       console.log(err);
       if (err.message.search('nvalid license'))
         ngToast.danger({ content: $translate.instant('license_invalid') });
-      else if (err.message.search('is already active'))
+      else if (err.message.search('in use'))
         ngToast.danger({ content: $translate.instant('license_already_activated') });
       else
         ngToast.danger({ content: $translate.instant('student_not_updated') });

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

@@ -77,6 +77,15 @@ dashboardControllers.controller('StudentCtrl', function StudentCtrl(
     });
   });
 
+  $scope.updateLicenseExpiration = function () {
+    if (!$scope.studentData.license)
+      return;
+
+    $scope.studentData.license_expired = new Date($scope.studentData.license.expiration_ts) - new Date() < 0;
+    moment.locale($translate.use().substr(0, 2));
+    $scope.studentData.expiration_date = moment($scope.studentData.license.expiration_ts).format('L');
+  };
+
   // ----------------------------------------------------------------------
   //
   // Load student account information
@@ -103,6 +112,8 @@ dashboardControllers.controller('StudentCtrl', function StudentCtrl(
     $scope.studentData.current_instruction = data.current_instruction;
     $scope.studentData.supervision = data.supervision; // supervision level on student: 0->admin, 1->tutor, 2->therapist
     $scope.studentData.license = data.license;
+    $scope.updateLicenseExpiration();
+
 
     // Setup section: Fill formUser (data able to be modified) from studentData parent object
     // It must go here to assign the values when studentData is recovered
@@ -117,8 +128,6 @@ dashboardControllers.controller('StudentCtrl', function StudentCtrl(
     $scope.formUser.notes = $scope.studentData.notes;
     if ($scope.studentData.license) {
       $scope.formUser.license_number = $scope.studentData.license.number;
-      moment.locale($translate.use().substr(0, 2));
-      $scope.expiration_date = moment($scope.studentData.license.expiration_ts).format('L');
     }
 
     // Subscribe to student's socket room

sails/src/assets/scripts/modules/student/views/setup.html

@@ -37,11 +37,14 @@
                   <div class="form-group">
                     <input type="text" id="setup_license" mask="9999-9999-9999-9999" clean="true" placeholder="{{ 'license_number' | translate }}" ng-model="formUser.license_number" required>
                     <br/>
-                    <span ng-show="studentData.license" class="text-info">
-                      ({{ 'license_expires' | translate }} {{ expiration_date }})
+                    <span ng-show="studentData.license && !studentData.license_expired" class="text-info">
+                      ({{ 'license_expires' | translate }} {{ studentData.expiration_date }})
+                    </span>
+                    <span ng-show="studentData.license && studentData.license_expired" class="text-danger">
+                      ({{ 'license_expired' | translate }} {{ studentData.expiration_date }})
                     </span>
                     <span ng-show="!studentData.license" class="text-danger">
-                      {{ 'license_missing' | translate }}
+                      ({{ 'license_missing' | translate }})
                     </span>
                   </div>
                 </fieldset>
@@ -352,11 +355,11 @@
         <h3>{{ 'supervisors' | translate }}</h3>
         <!-- Supervisores (terapeutas) del alumno -->
         <div id="student_sups" ng-if="studentData.supervision != 1">
-          <legend translate>supervisors_setup</legend>
+          <legend translate>therapists</legend>
           <!-- Buscador de supervisores -->
           <p>
             <form role="search" ng-submit="search_sup()">
-              <div class="input-group">
+              <div class="input-group" ng-if="user.isSupAdmin">
                 <input type="email" class="form-control" placeholder="{{ 'search_sup_email' | translate }}" name="email_sup" id="email_sup" ng-model="supsForm.email_sup" required>
                 <div class="input-group-btn">
                   <button class="btn btn-default" type="submit">
@@ -381,7 +384,7 @@
               <!-- Imagen de perfil del supervisor -->
               <img ng-src="{{sup.pic}}" class="profile" alt="" title="" />
               {{sup.name}} {{sup.surname}}
-              <a ng-click="delete_sup(sup.id)" class="delete_sup" title="{{ 'unlink' | translate}}">
+              <a ng-if="user.isSupAdmin" ng-click="delete_sup(sup.id)" class="delete_sup" title="{{ 'unlink' | translate}}">
                 <span class="color_red glyphicon glyphicon-remove-circle" aria-hidden="true"></span>
               </a>
             </li>
@@ -396,7 +399,7 @@
           <!-- Buscador de tutores -->
           <p>
             <form role="search" ng-submit="search_tutor()">
-              <div class="input-group">
+              <div class="input-group" ng-if="user.isSupAdmin">
                 <input type="email" class="form-control" placeholder="{{ 'search_tutor_email' | translate }}" name="email_tutor" id="email_tutor" ng-model="supsForm.email_tutor" required>
                 <div class="input-group-btn">
                   <button class="btn btn-default" type="submit">
@@ -422,7 +425,7 @@
               <!-- Imagen de perfil del tutor -->
               <img ng-src="{{tutor.pic}}" class="profile" alt="" title="" />
               {{tutor.name}} {{tutor.surname}}
-              <a ng-click="delete_tutor(tutor.id)" class="delete_tutor" title="{{ 'unlink' | translate}}">
+              <a ng-if="user.isSupAdmin" ng-click="delete_tutor(tutor.id)" class="delete_tutor" title="{{ 'unlink' | translate}}">
                 <span class="color_red glyphicon glyphicon-remove-circle" aria-hidden="true"></span>
               </a>
             </li>

sails/src/assets/scripts/modules/supervisor/controllers/students.js

@@ -20,8 +20,8 @@ dashboardControllers.controller('StudentsCtrl', function StudentsCtrl(
     name: '',
     surname: '',
     birthdate: '',
-    country: '',
-    gender: 'F',
+    country: 'ES',
+    gender: 'M',
     lang: 'es-es',
     notes: '',
     pic: 'defaultAvatar.jpg',
@@ -74,13 +74,14 @@ dashboardControllers.controller('StudentsCtrl', function StudentsCtrl(
       name: '',
       surname: '',
       birthdate: '',
-      country: '',
-      gender: 'F',
+      country: 'ES',
+      gender: 'M',
       lang: 'es-es',
       notes: '',
       office: $scope.user.office || { name: '' },
       current_method: 'no_method',
-      current_instruction: 'no_instruction'
+      current_instruction: 'no_instruction',
+      license_number: ''
     };
 
     // Hide the form
@@ -114,33 +115,24 @@ dashboardControllers.controller('StudentsCtrl', function StudentsCtrl(
       data.current_method = $translate.instant('no_method');
       data.current_instruction = $translate.instant('no_instruction');
 
-      // Add to the list of students in view
       $scope.students.push(data);
-
-      // Delete the fields of the form to avoid data binding
-      // between the new element created and the form fields
       $scope.resetForm();
-
-      // Hide the add form to new adding
       $scope.hidestudentadd = true;
-
-      // Update counters
-      $scope.user.office.currentStudents += 1;
-      $scope.num_licenses_left -= 1;
     })
     .error(function (err) {
       var errorMessage = 'student_not_added';
-      console.log(err);
-      if (typeof err == "string" && err.search("Maximum number of enrolments reached") > 0)
+      if (err.message && err.message.search('nvalid license') > 0)
+        errorMessage = 'license_invalid';
+      else if (err.message && err.message.search('in use') > 0)
+        errorMessage = 'license_already_activated';
+      else if (typeof err == "string" && err.search("Maximum number of enrolments reached") > 0)
         errorMessage = 'max_licenses_reached';
-      if (typeof err == "string" && err.search("already exists") > 0)
-          errorMessage = 'student_already_exists';
+      else if (typeof err == "string" && err.search("already exists") > 0)
+        errorMessage = 'student_already_exists';
       else if (err && err.status === 400)
         errorMessage = 'invalid_fields';
 
       ngToast.danger({ content: $translate.instant(errorMessage) });
-      $scope.hidestudentadd = true;
-
     });
   };
 
@@ -148,32 +140,25 @@ dashboardControllers.controller('StudentsCtrl', function StudentsCtrl(
   * Delete Student
   */
   $scope.delete_student = function (student) {
-    $translate('confirmation').then(t => {
-      if ($window.confirm(t))
-        $http.delete(config.backend + '/stu/' + student.id)
-        .success(function () {
-          var i;
-          for (i = 0; i < $scope.students.length; i++) {
-            if (student.id === $scope.students[i].id) {
-              $scope.students.splice(i, 1);
-            }
+    if ($window.confirm($translate.instant('confirmation'))) {
+      $http.delete(config.backend + '/stu/' + student.id)
+      .success(function () {
+        var i;
+        for (i = 0; i < $scope.students.length; i++) {
+          if (student.id === $scope.students[i].id) {
+            $scope.students.splice(i, 1);
           }
-          $translate('student_deleted').then(function (translation) {
-            ngToast.success({ content: translation });
-          });
-
-          IOService.post('/stu/unsubscribe', {
-            action: 'unsubscribe'
-          });
-
-          // Update counters
-          $scope.user.office.currentStudents -= 1;
-          $scope.num_licenses_left += 1;
-        })
-        .error(function () {
-          ngToast.danger({ content: $translate.instant('student_not_deleted') });
+        }
+        ngToast.success({ content: $translate.instant('student_deleted') });
+
+        IOService.post('/stu/unsubscribe', {
+          action: 'unsubscribe'
         });
-    });
+      })
+      .error(function () {
+        ngToast.danger({ content: $translate.instant('student_not_deleted') });
+      });
+    }
   };
 
   // When a new student is added to the supervisor, we should update

sails/src/assets/scripts/modules/supervisor/views/students.html

@@ -28,6 +28,9 @@
     <!-- Fin .panel-body -->
 
     <!-- Table -->
+    <div ng-show="students.length == 0">
+      {{ no_students_for_user | translate }}
+    </div>
     <table id="table_students" class="table table-hover">
       <tr ng-repeat="student in students | filter:search_students | orderBy: ['surname', 'name']">
         <td>
@@ -36,6 +39,9 @@
             </div>
         </td>
         <td>
+          <span ng-show="!student.licenseIsValid" class="license-warning text-danger glyphicon glyphicon-warning-sign" aria-hidden="true" popover="{{ 'license_invalid' | translate}}" popover-trigger="mouseenter"></span>
+        </td>
+        <td>
             <h4>{{student.surname}}, {{student.name}}</h4>
         </td>
         <td>
@@ -43,7 +49,6 @@
         </td>
         <td> <!-- BUTTONS -->
 
-
            <a class="btn btn-default btn-lg" role="button" href="/app/#/student/{{student.id}}/collections" alt="{{ 'collections' | translate}}" popover="{{ 'collections' | translate}}" popover-trigger="mouseenter" ng-if="student.supervision != 0"><span class="glyphicon glyphicon-th" aria-hidden="true"></span></a>
 
            <span class="btn btn-default btn-lg" role="button" alt="{{ 'collections' | translate}}" popover="{{ 'collections' | translate}}" popover-trigger="mouseenter" ng-if="student.supervision == 0"><span class="glyphicon glyphicon-th" style="color: #bbb" aria-hidden="true"></span></span>
@@ -65,7 +70,7 @@
 
         </td> <!-- /BUTTONS -->
         <td>
-          <a ng-click="delete_student(student)" class="delete_stu" title="{{ 'delete' | translate}}">
+          <a ng-if="user.isSupAdmin" ng-click="delete_student(student)" class="delete_stu" title="{{ 'delete' | translate}}">
             <span class="color_red glyphicon glyphicon-remove-circle" aria-hidden="true"></span>
           </a>
         </td>

sails/src/assets/scripts/modules/supervisor/views/students_add.html

@@ -18,61 +18,65 @@
           <input type="password" class="form-control" id="setup_password2" placeholder="{{ 'password_confirm' | translate }}" ng-model="formdatastudent.password_confirm" />
         </div>
 
-        <legend translate>personal_data</legend>
-
         <div class="form-group">
-            <input type="text" class="form-control" id="student_name" placeholder="{{ 'name' | translate }}" required ng-model="formdatastudent.name" />
+          {{ 'language' | translate }}: <select class="form-control" name="student_language" id="student_language" ng-model="formdatastudent.lang">
+            <option value="es-es" selected>Español</option>
+            <option value="en-us">English</option>
+          </select>
         </div>
 
         <div class="form-group">
-            <input type="text" class="form-control" id="student_surname" placeholder="{{ 'surname' | translate }}" required ng-model="formdatastudent.surname" />
+          <input type="text" id="student_license" mask="9999-9999-9999-9999" clean="true" placeholder="{{ 'license_number' | translate }}" ng-model="formdatastudent.license_number" required>
         </div>
 
-        <div class="form-group">
-          <p class="input-group">
-            <input type="text" class="form-control" datepicker-popup="{{ 'day_format' | translate }}" ng-model="formdatastudent.birthdate" placeholder="{{ 'birthdate' | translate }}" is-open="opened_cal_student" close-text="{{'close' | translate}}" required />
-            <span class="input-group-btn">
-              <button type="button" class="btn btn-default" ng-click="open_calendar($event)"><i class="glyphicon glyphicon-calendar"></i></button>
-            </span>
-          </p>
-        </div>
 
-        <div class="form-group">
-          <select class="form-control" name="student_gender" id="student_gender" ng-model="formdatastudent.gender" required>
-            <option value="F" selected translate>woman</option>
-            <option value="M" translate>man</option>
-          </select>
-        </div>
-
-        <div class="form-group">
-          <legend translate>country</legend>
-          <select class="form-control" name="student_country" id="student_country" ng-model="formdatastudent.country" required>
-            <option value="ES" selected>España</option>
-            <option value="US">United States</option>
-            <option value="UK">United Kingdom</option>
-            <option value="IE">Ireland</option>
-          </select>
-        </div>
-      </fieldset>
     </div>
 
     <div class="col-sm-6">
-      <fieldset>
-        <legend translate>language</legend>
-        <div class="form-group">
-          <select class="form-control" name="student_language" id="student_language" ng-model="formdatastudent.lang">
-            <option value="es-es" selected>Español</option>
-            <option value="en-us">English</option>
-          </select>
-        </div>
-      </fieldset>
 
-      <fieldset>
-        <legend translate>notes</legend>
-        <div class="form-group">
-          <textarea class="form-control" name="student_notes" id="student_notes" ng-model="formdatastudent.notes" rows="5"></textarea>
+      <legend translate>personal_data</legend>
+
+      <div class="form-group">
+          <input type="text" class="form-control" id="student_name" placeholder="{{ 'name' | translate }}" required ng-model="formdatastudent.name" />
+      </div>
+
+      <div class="form-group">
+          <input type="text" class="form-control" id="student_surname" placeholder="{{ 'surname' | translate }}" required ng-model="formdatastudent.surname" />
+      </div>
+
+      <div class="row">
+
+        <div class="col-sm-6">
+          <div class="form-group">
+            <p class="input-group">
+              <input type="text" class="form-control" datepicker-popup="{{ 'day_format' | translate }}" ng-model="formdatastudent.birthdate" placeholder="{{ 'birthdate' | translate }}" is-open="opened_cal_student" close-text="{{'close' | translate}}" required />
+              <span class="input-group-btn">
+                <button type="button" class="btn btn-default" ng-click="open_calendar($event)"><i class="glyphicon glyphicon-calendar"></i></button>
+              </span>
+            </p>
+          </div>
         </div>
-      </fieldset>
+        <div class="col-sm-6">
+          <div class="form-group">
+            <select class="form-control" name="student_gender" id="student_gender" ng-model="formdatastudent.gender" required>
+              <option value="F" selected translate>woman</option>
+              <option value="M" translate>man</option>
+            </select>
+          </div>
+      </div>
+
+    </div>
+
+      <div class="form-group">
+        <span translate>country</span>:
+        <select class="form-control" name="student_country" id="student_country" ng-model="formdatastudent.country" required>
+          <option value="ES" selected>España</option>
+          <option value="US">United States</option>
+          <option value="UK">United Kingdom</option>
+          <option value="IE">Ireland</option>
+        </select>
+      </div>
+
     </div>
   </div>
   <!-- Fin de row -->

sails/src/assets/styles/main.css

@@ -774,7 +774,7 @@ img.profile{
 	margin-top: 4px;
 }
 
-.delete_stu{
+.delete_stu, .license-warning{
 	font-size: 24px;
 	margin-top: 10px;
 }

sails/src/config/policies.js

@@ -83,12 +83,12 @@ module.exports.policies = {
 
   StudentController: {
     eternal: true,
-    getInfo: ['tokenAuth'],
+    getInfo: ['tokenAuth', 'isSupervisorOfStudentOrIsSupAdmin'],
     supervisors: ['tokenAuth'],
     therapists: ['tokenAuth'],
     tutors: ['tokenAuth'],
-    link_supervisor: ['tokenAuth'],
-    pictos: ['tokenAuth'],
+    link_supervisor: ['tokenAuth', 'isSupAdmin'],
+    pictos: ['tokenAuth', 'isSupervisorOfStudent'],
     methods: ['tokenAuth'],
     lasttries: ['tokenAuth'],
     tries: ['tokenAuth'],
@@ -98,7 +98,7 @@ module.exports.policies = {
     update_picto: ['tokenAuth', 'isSupervisorOfStudent'],
     update_legend: ['tokenAuth'],
     login: true,
-    create: ['tokenAuth'],
+    create: ['tokenAuth', 'isSupAdmin'],
     upload: ['tokenAuth'],
     add_picto: ['tokenAuth', 'isSupervisorOfStudent'],
     subscribe: ['tokenAuth'],
@@ -107,8 +107,8 @@ module.exports.policies = {
     action: true,
     config: true,
     actions_batch: ['tokenAuth'],
-    delete: ['tokenAuth'],
-    unlink_supervisor: ['tokenAuth'],
+    delete: ['tokenAuth', 'isSupAdmin'],
+    unlink_supervisor: ['tokenAuth', 'isSupAdmin'],
     delete_picto: ['tokenAuth', 'isSupervisorOfStudent']
   },