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

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

@@ -26,6 +26,7 @@
     "alert": "Alert",
     "all": "All",
     "animation": "Animation",
+    "apply":"Apply",
     "annual": "Annual",
     "April": "April",
     "attributes_not_updated": "Changes not saved",
@@ -125,7 +126,11 @@
     "large": "Large",
     "last_session": "Last session",
     "legend": "Legend",
+    "legend_none":"No legend",
+    "legend_normal":"Normal legend",
+    "legend_full":"Only legend",
     "legend_size": "Legend size",
+    "legend_apply_all":"Apply to all pictograms",
     "licenses": "Licenses (max. number of students)",
     "licenses_left": "{{number}} licenses left",
     "light_up": "Light up",

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

@@ -26,6 +26,7 @@
     "alert": "Alerta",
     "all": "Todos",
     "animation": "Animación",
+    "apply":"Aplicar",
     "annual": "Anual",
     "April": "Abril",
     "attributes_not_updated": "Cambios no guardados",
@@ -125,6 +126,10 @@
     "large": "Grande",
     "last_session": "Última sesión",
     "legend": "Leyenda",
+    "legend_none":"Sin leyenda",
+    "legend_normal":"Leyenda normal",
+    "legend_full":"Sólo leyenda",
+    "legend_apply_all":"Aplicar a todos los pictogramas",
     "legend_size": "Tamaño de la leyenda",
     "licenses": "Licencias (número máximo de estudiantes)",
     "licenses_left": "{{number}} licencias disponibles",

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

@@ -50,24 +50,24 @@
                 </select>
               </div> -->
               <input type="radio" ng-model="studentPicto.attributes.legend" value="none" ng-change="update_properties()">
-              Sin leyenda
+              <span translate>legend_none</span>
               <br/>
               <input type="radio" ng-model="studentPicto.attributes.legend" value="normal" ng-change="update_properties()">
-              Leyenda normal
+              <span translate>legend_normal</span>
               <br/>
               <input type="radio" ng-model="studentPicto.attributes.legend" value="full" ng-change="update_properties()">
-              Solo leyenda
+              <span translate>legend_full</span>
             </div>
           </div>
           <hr>
           <div class="row">
-            <div class="col-md-6">
+            <div class="col-md-8">
               <input type="checkbox">
-              Aplicar a todos los pictogramas
+              <span translate>legend_apply_all</span>
             </div>
-            <div class="col-md-6">
+            <div class="col-md-4">
               <div class="form-group text-center">
-                <button type="submit" class="btn btn-primary ng-scope" ng-click="">Aplicar</button>
+                <button type="submit" class="btn btn-primary ng-scope" ng-click="" disabled translate>apply</button>
               </div>
             </div>
           </div>

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

@@ -45,7 +45,8 @@
               </div>
               <div class="form-group">
                 <select class="form-control" name="student_gender" id="student_gender" ng-model="formUser.gender" required>
-                  <option value="F" selected translate>woman</option>
+                  <option value=" ">&nsp;</option>
+                  <option value="F" translate>woman</option>
                   <option value="M" translate>man</option>
                 </select>
               </div>
@@ -59,7 +60,7 @@
               </div>
             </fieldset>
 
-            <fieldset>
+            <fieldset ng-if="studentData.supervision != 1">
               <legend translate>notes</legend>
               <div class="form-group">
                 <textarea class="form-control" name="student_notes" id="student_notes" ng-model="formUser.notes" rows="5"></textarea>
@@ -87,7 +88,7 @@
       <!-- Parte derecha: Tutores y dispositivos -->
       <div class="col-md-6">
         <!-- Supervisores (terapeutas) del alumno -->
-        <div id="student_sups">
+        <div id="student_sups" ng-if="studentData.supervision != 1">
           <h3 translate>supervisors</h3>
           <!-- Buscador de supervisores -->
           <p>
@@ -127,7 +128,7 @@
         <!-- Fin de id student-sups -->
 
         <!-- Tutores (Padres) -->
-        <div id="student_tutors">
+        <div id="student_tutors" ng-if="studentData.supervision != 1">
           <h3>{{ 'tutors' | translate }}</h3>
           <!-- Buscador de tutores -->
           <p>

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

@@ -11,7 +11,7 @@
       <!-- Add Student button and Search row -->
       <div class="row">
         <div class="col-xs-3">
-          <p class="text-left" ng-hide="!user.isSupAdmin || !num_licenses_left || !hidestudentadd">
+          <p class="text-left" ng-hide="!user.isSupAdmin || !hidestudentadd">
   	        <a ng-click="resetForm(); hidestudentadd = false" class="btn btn-success btn-sm" role="button">
   	          <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> {{ 'add_student' | translate }}
   	        </a>
@@ -60,9 +60,8 @@
 
            <span class="btn btn-default btn-lg" role="button" alt="{{ 'reports' | translate}}" popover="{{ 'reports' | translate}}" popover-trigger="mouseenter" ng-if="student.supervision == 1"><span class="glyphicon glyphicon-file" aria-hidden="true" style="color: #bbb"></span></span>
 
-           <a class="btn btn-default btn-lg" role="button" href="/app/#/student/{{student.id}}/setup" alt="{{ 'setup' | translate}}" popover="{{ 'setup' | translate}}" popover-trigger="mouseenter" ng-if="student.supervision != 1"><span class="glyphicon glyphicon-cog" aria-hidden="true"></span></a>
+           <a class="btn btn-default btn-lg" role="button" href="/app/#/student/{{student.id}}/setup" alt="{{ 'setup' | translate}}" popover="{{ 'setup' | translate}}" popover-trigger="mouseenter"><span class="glyphicon glyphicon-cog" aria-hidden="true"></span></a>
 
-           <span class="btn btn-default btn-lg" role="button" alt="{{ 'setup' | translate}}" popover="{{ 'setup' | translate}}" popover-trigger="mouseenter" ng-if="student.supervision == 1"><span class="glyphicon glyphicon-cog" aria-hidden="true" style="color: #bbb"></span></span>
 
         </td> <!-- /BUTTONS -->
         <td>