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

sails/src/assets/scripts/app.js

@@ -121,6 +121,12 @@ dashboardApp.config(function ($stateProvider, $urlRouterProvider) {
       templateUrl: 'modules/supervisor/views/instructions.html',
       templateUrl: 'modules/supervisor/views/instructions.html',
       controller: 'InstructionsCtrl',
       controller: 'InstructionsCtrl',
     })
     })
+    .state('supervisors_students', {
+      url: '/supervisors_students',
+      parent: 'supervisor',
+      templateUrl: 'modules/supervisor/views/supervisors_students.html',
+      controller: 'StudentsCtrl',
+    })
     // Abstract page for student
     // Abstract page for student
     .state('student', {
     .state('student', {
       templateUrl: 'modules/student/views/student.html',
       templateUrl: 'modules/student/views/student.html',

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

@@ -32,6 +32,11 @@
               {{ 'students' | translate }}
               {{ 'students' | translate }}
             </a>
             </a>
           </li>
           </li>
+          <li>
+            <a class="pointer" role="menuitem" tabindex="0" href="/app/#/supervisors_students">
+              <i class="glyphicon glyphicon-star" aria-hidden="true"></i>
+              {{ 'supervisors' | translate }}
+            </a>
           <li ng-if="user.isTutor == false">
           <li ng-if="user.isTutor == false">
             <a class="pointer" role="menuitem" tabindex="0" href="/app/#/instructions">
             <a class="pointer" role="menuitem" tabindex="0" href="/app/#/instructions">
               <i class="glyphicon glyphicon-tasks" aria-hidden="true"></i>
               <i class="glyphicon glyphicon-tasks" aria-hidden="true"></i>

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

+<!-- Admin Supervisors -->
+
+<div class="row">
+  <div ng-class="{'col-md-12':hidesupervisoradd === true && hidesupervisorupdate === true, 'col-md-8':hidesupervisoradd === false || hidesupervisorupdate === false}">
+
+    <h3 translate>supervisors</h3>
+
+    <div class="row">
+      <div class="col-xs-3">
+        <a ng-click="resetForm(); hidesupervisoradd = false" class="btn btn-success btn-sm" role="button">
+          <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> {{ 'add_supervisor' | translate }}
+        </a>
+      </div>
+      <div class="col-xs-6 input-group">
+        <input type="text" ng-model="search_sups" id="search_sups" placeholder="{{ 'filter' | translate }}" class="form-control" aria-describedby="basic-addon2">
+        <span class="input-group-addon glyphicon glyphicon-search" id="basic-addon2" aria-hidden="true"></span>
+      </div>
+      <div class="col-xs-3">
+      </div>
+    </div>
+
+    <table class="table table-striped">
+      <tr>
+        <th translate>name</th>
+        <th translate>email</th>
+        <th>Ops</th>
+      </tr>
+      <tr ng-repeat="supervisor in supervisors | filter:search_sups | orderBy: 'name'">
+        <td class="color_blue">{{supervisor.name}} {{supervisor.surname}}</td>
+        <td>{{supervisor.email}}</td>
+        <td class="ops">
+          <a ng-click="update_supervisor(supervisor)" title="{{'edit'|translate}}"><span class="glyphicon glyphicon-pencil" aria-hidden="true"></span></a>
+
+          <a ng-click="delete_supervisor(supervisor)" title="{{'delete'|translate}}"><span class="color_red glyphicon glyphicon-remove-circle" aria-hidden="true"></span></a>
+        </td>
+      </tr>
+    </table>
+  </div>
+
+<!-- Add Supervisor Form -->
+  <div ng-include="'modules/admin/views/supervisors_add.html'" class="col-md-4" ng-init="hidesupervisoradd = true" ng-hide="hidesupervisoradd"></div>
+
+<!-- Update Supervisor Form -->
+  <div ng-include="'modules/admin/views/supervisors_update.html'" class="col-md-4" ng-init="hidesupervisorupdate = true" ng-hide="hidesupervisorupdate"></div>
+
+</div>

sails/src/assets/styles/main.css

@@ -958,3 +958,7 @@ input[type=range]:focus::-ms-fill-upper {
 
 
     font: 32px Arial, sans-serif;
     font: 32px Arial, sans-serif;
 }
 }
+
+.input-group-addon:first-child{
+		top: 0px;
+}