Skip to content

yotta / pictogram

Go to a project
Commit c58855bc by Arturo Montejo Ráez
Options

issue #854 on improving student setup section done

parent c7abca0f
Inline Side-by-side
Showing with 300 additions and 409 deletions
sails/src/assets/app/i18n/en-gb.json
...@@ -78,6 +78,7 @@ ...@@ -78,6 +78,7 @@
"delete_strip_after_delivery": "Empty strip after delivery", "delete_strip_after_delivery": "Empty strip after delivery",
"delete_template": "Delete from templates", "delete_template": "Delete from templates",
"description": "Description", "description": "Description",
"device": "Device",
"device_setup": "Device setup", "device_setup": "Device setup",
"disabled": "Disabled. Clic for invisible", "disabled": "Disabled. Clic for invisible",
"disclaimer": "Conditions of use", "disclaimer": "Conditions of use",
......
sails/src/assets/app/i18n/es-es.json
...@@ -78,6 +78,7 @@ ...@@ -78,6 +78,7 @@
"delete_strip_after_delivery": "Limpiar cinta tras entrega", "delete_strip_after_delivery": "Limpiar cinta tras entrega",
"delete_template": "Eliminar de plantillas", "delete_template": "Eliminar de plantillas",
"description": "Descripción", "description": "Descripción",
"device": "Dispositivo",
"device_setup": "Configuración del dispositivo", "device_setup": "Configuración del dispositivo",
"disabled": "Desactivado. Clic para invisible", "disabled": "Desactivado. Clic para invisible",
"disclaimer": "Condiciones de uso", "disclaimer": "Condiciones de uso",
......
sails/src/assets/scripts/modules/student/controllers/setup.js
...@@ -26,7 +26,8 @@ dashboardControllers.controller('StudentSetupCtrl', function StudentSetupCtrl( ...@@ -26,7 +26,8 @@ dashboardControllers.controller('StudentSetupCtrl', function StudentSetupCtrl(
});*/ });*/
$scope.supsForm = {}; $scope.supsForm = {};
$scope.section = 'account';
$scope.changeImg = function () { $scope.changeImg = function () {
$scope.progress = 0; $scope.progress = 0;
......
sails/src/assets/scripts/modules/student/views/header.html
...@@ -58,9 +58,9 @@ ...@@ -58,9 +58,9 @@
<a href="/app/#/student/{{studentData.id}}/session" ng-click="nav.tab = 'session'"><span class="glyphicon glyphicon-transfer" aria-hidden="true"></span> {{ 'sessions' | translate }}</a> <a href="/app/#/student/{{studentData.id}}/session" ng-click="nav.tab = 'session'"><span class="glyphicon glyphicon-transfer" aria-hidden="true"></span> {{ 'sessions' | translate }}</a>
</li> </li>
<li role="presentation" ng-class="{'active' : nav.tab == 'reports'}" ng-if="studentData.supervision != 1"> <li role="presentation" ng-class="{'active' : nav.tab == 'reports'}" ng-if="studentData.supervision != 1">
<a href="/app/#/student/{{studentData.id}}/reports" ng-click="nav.tab = 'reports'"><span class="glyphicon glyphicon-file" aria-hidden="true"></span> {{ 'reports' | translate }}</a> <a href="/app/#/student/{{studentData.id}}/reports" ng-click="nav.tab = 'reports'"><i class="fa fa-bar-chart" aria-hidden="true"></i> {{ 'reports' | translate }}</a>
</li> </li>
<li role="presentation" ng-class="{'active' : nav.tab == 'setup'}" ng-if="studentData.supervision != 0"> <li role="presentation" ng-class="{'active' : nav.tab == 'setup'}">
<a href="/app/#/student/{{studentData.id}}/setup" ng-click="nav.tab = 'setup'" <a href="/app/#/student/{{studentData.id}}/setup" ng-click="nav.tab = 'setup'"
><span class="glyphicon glyphicon-cog" aria-hidden="true"></span> {{ 'setup' | translate }}</a> ><span class="glyphicon glyphicon-cog" aria-hidden="true"></span> {{ 'setup' | translate }}</a>
</li> </li>
......
sails/src/assets/scripts/modules/student/views/setup.html
<div class="panel panel-default student_tab_panel"> <div class="panel panel-default student_tab_panel">
<div class="panel-body"> <div class="panel-body">
<div class="row">
<!-- Parte izquierda: Datos personales -->
<div class="col-md-6">
<div id="student_personal_edit">
<form role="form" ng-submit="updateStudent()">
<legend translate>account</legend> <div class="btn-group">
<button class="btn btn-default" btn-radio="'account'" ng-model="section">
<i class="fa fa-user" aria-hidden="true"></i> {{ 'account' | translate }}
</button>
<button class="btn btn-default" btn-radio="'device'" ng-model="section">
<i class="fa fa-tablet" aria-hidden="true"></i> {{ 'device' | translate }}
</button>
<button class="btn btn-default" btn-radio="'supervisors'" ng-model="section">
<i class="fa fa-users" aria-hidden="true"></i> {{ 'supervisors' | translate }}
</button>
</div>
<div class="row"> <div class="row" ng-show="section == 'account'">
<div class="col-md-6"> <!-- Parte izquierda: Datos personales -->
<div class="col-md-6">
<legend translate>account</legend>
<div class="row">
<div class="col-md-6">
<div id="student_personal_edit">
<form role="form" ng-submit="updateStudent()">
<!-- Preview --> <!-- Preview -->
<img class="thumbnail preview" ng-src="{{studentData.pic}}" /> <img class="thumbnail preview" ng-src="{{studentData.pic}}" />
...@@ -20,97 +31,101 @@ ...@@ -20,97 +31,101 @@
<span class="glyphicon glyphicon-folder-open"></span> {{ 'change_picture' | translate }} <span class="glyphicon glyphicon-folder-open"></span> {{ 'change_picture' | translate }}
</button> </button>
</div> </div>
</div> </div>
<div class="col-md-6"> </div>
<fieldset> <div class="col-md-6">
<div class="form-group">
<input type="username" class="form-control" id="setup_username" placeholder="{{ 'username' | translate }}" required ng-model="formUser.username" readonly/>
</div>
<div class="form-group">
<input style="display:none" type="password" name="fakepasswordremembered"/>
<input type="password" class="form-control" id="setup_password1" placeholder="{{ 'password_new_type' | translate }}" ng-model="formUser.password"/>
</div>
<div class="form-group">
<input type="password" class="form-control" id="setup_password2" placeholder="{{ 'password_confirm' | translate }}" ng-model="formUser.password_confirm"/>
</div>
<div class="form-group">
<label translate>license_number</label>
<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 && !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 }})
</span>
</div>
</fieldset>
</div> <fieldset>
<div class="form-group">
<input type="username" class="form-control" id="setup_username" placeholder="{{ 'username' | translate }}" required ng-model="formUser.username" readonly/>
</div>
<div class="form-group">
<input style="display:none" type="password" name="fakepasswordremembered"/>
<input type="password" class="form-control" id="setup_password1" placeholder="{{ 'password_new_type' | translate }}" ng-model="formUser.password"/>
</div>
<div class="form-group">
<input type="password" class="form-control" id="setup_password2" placeholder="{{ 'password_confirm' | translate }}" ng-model="formUser.password_confirm"/>
</div>
<div class="form-group">
<label translate>license_number</label>
<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 && !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 }})
</span>
</div>
</fieldset>
</div> </div>
<fieldset> </div>
<legend translate>personal_data</legend> </div>
<div class="row"> <div class="col-md-6">
<div class="col-md-6">
<div class="form-group"> <fieldset>
<label translate>name</label> <legend translate>personal_data</legend>
<input type="text" class="form-control" id="student_personal_edit_name" placeholder="{{ 'name' | translate }}" ng-model="formUser.name" required />
</div>
<div class="form-group">
<label translate>surname</label>
<input type="text" class="form-control" id="student_personal_edit_surname" placeholder="{{ 'surname' | translate }}" ng-model="formUser.surname" required />
</div>
<div class="form-group">
<label translate>birthdate</label>
<p class="input-group">
<input type="text" class="form-control" datepicker-popup=" {{ 'day_format' | translate }}" ng-model="formUser.birthdate" placeholder="{{ 'birthdate' | translate }}" is-open="opened" close-text="{{'close' | translate}}" required />
<span class="input-group-btn">
<button type="button" class="btn btn-default" ng-click="openCalendar($event)"><i class="glyphicon glyphicon-calendar"></i></button>
</span>
</p>
</div>
</div> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<fieldset> <div class="form-group">
<div class="form-group"> <label translate>name</label>
<label translate>gender</label> <input type="text" class="form-control" id="student_personal_edit_name" placeholder="{{ 'name' | translate }}" ng-model="formUser.name" required />
<select class="form-control" name="student_gender" id="student_gender" ng-model="formUser.gender" required> </div>
<option value=" ">&nsp;</option> <div class="form-group">
<option value="F" translate>woman</option> <label translate>surname</label>
<option value="M" translate>man</option> <input type="text" class="form-control" id="student_personal_edit_surname" placeholder="{{ 'surname' | translate }}" ng-model="formUser.surname" required />
</select> </div>
</div> <div class="form-group">
<div class="form-group"> <label translate>birthdate</label>
<label translate>country</label> <p class="input-group">
<select class="form-control" name="student_country" id="student_country" ng-model="formUser.country" required> <input type="text" class="form-control" datepicker-popup=" {{ 'day_format' | translate }}" ng-model="formUser.birthdate" placeholder="{{ 'birthdate' | translate }}" is-open="opened" close-text="{{'close' | translate}}" required />
<option value="ES">España</option> <span class="input-group-btn">
<option value="US">United States</option> <button type="button" class="btn btn-default" ng-click="openCalendar($event)"><i class="glyphicon glyphicon-calendar"></i></button>
<option value="UK">United Kingdom</option> </span>
<option value="IE">Ireland</option> </p>
</select> </div>
</div>
<div class="form-group"> </div>
<label translate>language</label> <div class="col-md-6">
<select class="form-control" name="supervisor_language" id="supervisor_language" ng-model="formUser.lang">
<option value="es-es">Español</option>
<option value="en-gb">English</option>
</select>
</div>
</fieldset>
<fieldset>
<div class="form-group">
<label translate>gender</label>
<select class="form-control" name="student_gender" id="student_gender" ng-model="formUser.gender" required>
<option value=" ">&nsp;</option>
<option value="F" translate>woman</option>
<option value="M" translate>man</option>
</select>
</div> </div>
</div> <div class="form-group">
<label translate>country</label>
<select class="form-control" name="student_country" id="student_country" ng-model="formUser.country" required>
<option value="ES">España</option>
<option value="US">United States</option>
<option value="UK">United Kingdom</option>
<option value="IE">Ireland</option>
</select>
</div>
<div class="form-group">
<label translate>language</label>
<select class="form-control" name="supervisor_language" id="supervisor_language" ng-model="formUser.lang">
<option value="es-es">Español</option>
<option value="en-gb">English</option>
</select>
</div>
</fieldset>
</div>
</div>
<fieldset ng-if="studentData.supervision != 1"> <fieldset ng-if="studentData.supervision != 1">
<legend translate>notes</legend> <legend translate>notes</legend>
...@@ -124,340 +139,213 @@ ...@@ -124,340 +139,213 @@
</div> </div>
</form> </form>
</div> </div>
<!-- Fin de student_personal_edit --> </div> <!-- Fin de student_personal_edit -->
</div>
<!-- Configuración dispositivo -->
<div class="col-md-6">
<div id="device_setup">
<legend translate>device_setup</legend>
<!-- Configuración dispositivo -->
<div id="device_setup" ng-show="section == 'device'">
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<legend translate>device_setup</legend>
<form role="form" class="form"> </div>
<fieldset>
<div class="form-group">
<label translate>categories</label>
<div class="input-group">
<span class="input-group-addon">
<input type="checkbox"
id="studentSetupUseCategories"
ng-model="studentData.attributes.categories"
ng-change="update_attributes()">
</span>
<span class="form-control" for="studentSetupUseCategories">{{ 'use_categories' | translate }}</span>
</div>
</div>
<div class="form-group">
<label translate>picto_size</label>
<div class="input-group">
<span class="input-group-addon">
<input type="radio"
value="small"
id="studentSetupPictoSizeSmall"
ng-model="studentData.attributes.size"
ng-change="update_attributes()">
</span>
<span class="form-control" for="studentSetupPictoSizeSmall">
{{ 'small_picto' | translate }}
</span>
</div>
<div class="input-group">
<span class="input-group-addon">
<input type="radio"
value="large"
id="studentSetupPictoSizeLarge"
ng-model="studentData.attributes.size"
ng-change="update_attributes()">
</span>
<span class="form-control" for="studentSetupPictoSizeLarge">
{{ 'large_picto' | translate }}
</span>
</div>
</div>
</fieldset>
</div> </div>
<div class="col-md-6"> <div class="row">
<form role="form" class="form">
<fieldset> <div class="col-md-3">
<label translate>feedback_picto</label> <fieldset>
<div class="input-group"> <div class="form-group">
<span class="input-group-addon"> <label translate>categories</label>
<input type="checkbox" <div class="input-group">
id="studentSetupVibrateOnTouch" <span class="input-group-addon">
ng-model="studentData.attributes.input_feedback.vibration" <input type="checkbox"
ng-change="update_attributes()"> id="studentSetupUseCategories"
</span> ng-model="studentData.attributes.categories"
<span class="form-control" for="studentSetupVibrateOnTouch">{{ 'vibration' | translate }}</span> ng-change="update_attributes()">
</div> </span>
<div class="input-group"> <span class="form-control" for="studentSetupUseCategories">{{ 'use_categories' | translate }}</span>
<span class="input-group-addon"> </div>
<input type="checkbox" </div>
id="studentSetupBeepOnTouch" <div class="form-group">
ng-model="studentData.attributes.input_feedback.beep" <label translate>picto_size</label>
ng-change="update_attributes()"> <div class="input-group">
</span> <span class="input-group-addon">
<span class="form-control" for="studentSetupBeepOnTouch">{{ 'beep' | translate }}</span> <input type="radio"
</div> value="small"
<div class="input-group"> id="studentSetupPictoSizeSmall"
<span class="input-group-addon"> ng-model="studentData.attributes.size"
<input type="checkbox" ng-change="update_attributes()">
id="studentSetupReadOnTouch" </span>
ng-model="studentData.attributes.input_feedback.read" <span class="form-control" for="studentSetupPictoSizeSmall">
ng-change="update_attributes()"> {{ 'small_picto' | translate }}
</span> </span>
<span class="form-control" for="studentSetupReadOnTouch">{{ 'read_picto' | translate }}</span> </div>
</div> <div class="input-group">
<div class="input-group"> <span class="input-group-addon">
<span class="input-group-addon"> <input type="radio"
<input type="checkbox" value="large"
id="studentSetupHighlightOnTouch" id="studentSetupPictoSizeLarge"
ng-model="studentData.attributes.input_feedback.highlight" ng-model="studentData.attributes.size"
ng-change="update_attributes()"> ng-change="update_attributes()">
</span> </span>
<span class="form-control" for="studentSetupHighlightOnTouch"> <span class="form-control" for="studentSetupPictoSizeLarge">
{{ 'highlight' | translate }} {{ 'large_picto' | translate }}
</span> </span>
</div> </div>
<div class="input-group"> </div>
<span class="input-group-addon"> </fieldset>
<input type="checkbox"
id="studentSetupDeleteStripAfterDelivery"
ng-model="studentData.attributes.input_feedback.delete_strip_after_delivery"
ng-change="update_attributes()">
</span>
<span class="form-control" for="studentSetupDeleteStripAfterDelivery">
{{ 'delete_strip_after_delivery' | translate }}
</span>
</div>
</fieldset>
<!-- DISABLED, NOT IMPLEMENTED YET
<fieldset>
<legend>{{ 'input_selection' | translate }}</legend>
<div class="input-group">
<span class="input-group-addon">
<input type="checkbox"
id="studentSetupSelectOnClick"
ng-model="studentData.attributes.input_selection.click"
ng-change="update_attributes()">
</span>
<label class="form-control" for="studentSetupSelectOnClick">
{{ 'click' | translate }}
</label>
</div>
<div class="input-group">
<span class="input-group-addon">
<input type="checkbox"
id="studentSetupSelectOnDoubleClick"
ng-model="studentData.attributes.input_selection.double_click"
ng-change="update_attributes()">
</span>
<label class="form-control" for="studentSetupSelectOnDoubleClick">
{{ 'double_click' | translate }}
</label>
</div>
<div class="input-group">
<span class="input-group-addon">
<input type="checkbox"
id="studentSetupSelectOnLongPress"
ng-model="studentData.attributes.input_selection.long_press"
ng-change="update_attributes()">
</span>
<label class="form-control" for="studentSetupSelectOnLongPress">
{{ 'press' | translate }}
</label>
</div>
<div class="input-group">
<span class="input-group-addon">
<input type="checkbox"
id="studentSetupSelectOnDrag"
ng-model="studentData.attributes.input_selection.drag"
ng-change="update_attributes()">
</span>
<label class="form-control" for="studentSetupSelectOnDrag">
{{ 'drag' | translate }}
</label>
</div>
</fieldset>
<fieldset>
<div class="input-group">
<span class="input-group-addon">
<input type="color"
id="studentSetupPictoBackground"
ng-model="studentData.attributes.picto_background"
ng-change="update_attributes()">
</span>
<label class="form-control" for="studentSetupPictoBackground">
{{ 'background' | translate }}
</label>
</div>
<div class="input-group">
<span class="input-group-addon">
<input type="color"
id="studentSetupTapeBackground"
ng-model="studentData.attributes.tape_background"
ng-change="update_attributes()">
</span>
<label class="form-control" for="studentSetupTapeBackground">
{{ 'tape_background' | translate }}
</label>
</div>
</fieldset>
<fieldset>
<legend>{{ 'legend' | translate }}</legend>
<div class="input-group">
<span class="input-group-addon">
<input type="checkbox"
id="studentSetupShowPictoLegend"
ng-model="studentData.attributes.legend"
ng-change="update_attributes()">
</span>
<label class="form-control" for="studentSetupShowPictoLegend">
{{ 'show' | translate }}
</label>
</div>
<fieldset class="form-group" ng-disabled="!studentData.attributes.legend">
<h4>{{ 'legend_size' | translate }}</h4>
<div class="input-group">
<span class="input-group-addon">
<input type="radio"
value="small"
id="studentSetupPictoLegendSizeSmall"
ng-model="studentData.attributes.legend_size"
ng-change="update_attributes()">
</span>
<label class="form-control" for="studentSetupPictoLegendSizeSmall">
{{ 'small' | translate }}
</label>
</div>
<div class="input-group">
<span class="input-group-addon">
<input type="radio"
value="normal"
id="studentSetupPictoLegendSizeNormal"
ng-model="studentData.attributes.legend_size"
ng-change="update_attributes()">
</span>
<label class="form-control" for="studentSetupPictoLegendSizeNormal">
{{ 'normal' | translate }}
</label>
</div>
<div class="input-group">
<span class="input-group-addon">
<input type="radio"
value="large"
id="studentSetupPictoLegendSizeLarge"
ng-model="studentData.attributes.legend_size"
ng-change="update_attributes()">
</span>
<label class="form-control" for="studentSetupPictoLegendSizeLarge">
{{ 'large' | translate }}
</label>
</div> </div>
</fieldset> <div class="col-md-3">
</fieldset> <fieldset>
--> <label translate>feedback_picto</label>
</form> <div class="input-group">
</div> <span class="input-group-addon">
<input type="checkbox"
</div> id="studentSetupVibrateOnTouch"
</div> ng-model="studentData.attributes.input_feedback.vibration"
ng-change="update_attributes()">
<!-- /configuración dispositivo --> </span>
<span class="form-control" for="studentSetupVibrateOnTouch">{{ 'vibration' | translate }}</span>
</div>
<!-- Parte derecha: Tutores y dispositivos --> <div class="input-group">
<!-- Supervisores (terapeutas) del alumno --> <span class="input-group-addon">
<div id="student_sups" ng-if="studentData.supervision != 1"> <input type="checkbox"
<legend translate>therapists</legend> id="studentSetupBeepOnTouch"
<!-- Buscador de supervisores --> ng-model="studentData.attributes.input_feedback.beep"
<p> ng-change="update_attributes()">
<form role="search" ng-submit="search_sup()"> </span>
<div class="input-group" ng-if="user.isSupAdmin"> <span class="form-control" for="studentSetupBeepOnTouch">{{ 'beep' | translate }}</span>
<input type="email" class="form-control" placeholder="{{ 'search_sup_email' | translate }}" name="email_sup" id="email_sup" ng-model="supsForm.email_sup" required> </div>
<div class="input-group-btn"> <div class="input-group">
<button class="btn btn-default" type="submit"> <span class="input-group-addon">
<span class="glyphicon glyphicon-search"></span> <input type="checkbox"
</button> id="studentSetupReadOnTouch"
</div> ng-model="studentData.attributes.input_feedback.read"
ng-change="update_attributes()">
</span>
<span class="form-control" for="studentSetupReadOnTouch">{{ 'read_picto' | translate }}</span>
</div>
<div class="input-group">
<span class="input-group-addon">
<input type="checkbox"
id="studentSetupHighlightOnTouch"
ng-model="studentData.attributes.input_feedback.highlight"
ng-change="update_attributes()">
</span>
<span class="form-control" for="studentSetupHighlightOnTouch">
{{ 'highlight' | translate }}
</span>
</div>
<div class="input-group">
<span class="input-group-addon">
<input type="checkbox"
id="studentSetupDeleteStripAfterDelivery"
ng-model="studentData.attributes.input_feedback.delete_strip_after_delivery"
ng-change="update_attributes()">
</span>
<span class="form-control" for="studentSetupDeleteStripAfterDelivery">
{{ 'delete_strip_after_delivery' | translate }}
</span>
</div>
</fieldset>
</div> </div>
</form> </form>
</p>
<!-- Alert and success messages for supervisor found -->
<div ng-show="{{ 'showmessagesupfound' }}" class="alert alert-info">
<!-- Imagen de perfil del tutor -->
<img ng-src="{{supToAdd.pic}}" class="profile" alt="" title="" /> {{ supToAdd.name }} {{ supToAdd.surname }}
<a class="btn btn-default btn-lg pull-right" role="button" ng-click="add_sup()" translate>add</a>
</div> </div>
<!-- Fin de buscador de supervisores -->
<!-- Supervisores asignados -->
<ul class="list-group" id="user_sups">
<li class="list-group-item" ng-repeat="sup in studentSupervisors">
<!-- Imagen de perfil del supervisor -->
<img ng-src="{{sup.pic}}" class="profile" alt="" title="" />
{{sup.name}} {{sup.surname}}
<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>
</ul>
<!-- Fin de Supervisores asignados -->
</div> </div>
<!-- Fin de id student-sups -->
<!-- Tutores (Padres) --> <!-- Tutores y dispositivos -->
<div id="student_tutors" ng-if="studentData.supervision != 1"> <div id="supervisors_section" ng-show="section == 'supervisors'">
<legend translate>tutors</legend>
<!-- Buscador de tutores --> <div class="row">
<p> <div class="col-md-4" ng-if="studentData.supervision != 1">
<form role="search" ng-submit="search_tutor()"> <!-- Supervisores (terapeutas) del alumno -->
<div class="input-group" ng-if="user.isSupAdmin"> <div id="student_sups">
<input type="email" class="form-control" placeholder="{{ 'search_tutor_email' | translate }}" name="email_tutor" id="email_tutor" ng-model="supsForm.email_tutor" required> <legend translate>therapists</legend>
<div class="input-group-btn"> <!-- Buscador de supervisores -->
<button class="btn btn-default" type="submit"> <p>
<span class="glyphicon glyphicon-search"></span> <form role="search" ng-submit="search_sup()">
</button> <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">
<span class="glyphicon glyphicon-search"></span>
</button>
</div>
</div> </div>
</div> </form>
</form> </p>
</p>
<!-- Alert and success messages for tutor found --> <!-- Alert and success messages for supervisor found -->
<div ng-show="{{ 'showmessagetutorfound' }}" class="alert alert-info"> <div ng-show="{{ 'showmessagesupfound' }}" class="alert alert-info">
<!-- Imagen de perfil del tutor --> <!-- Imagen de perfil del tutor -->
<img ng-src="{{tutorToAdd.pic}}" class="profile" alt="" title="" /> <img ng-src="{{supToAdd.pic}}" class="profile" alt="" title="" /> {{ supToAdd.name }} {{ supToAdd.surname }}
{{ tutorToAdd.name }} {{ tutorToAdd.surname }} <a class="btn btn-default btn-lg pull-right" role="button" ng-click="add_sup()" translate>add</a>
<a class="btn btn-default btn-sm pull-right" role="button" ng-click="add_tutor()" translate>add</a> </div>
<!-- Fin de buscador de supervisores -->
<!-- Supervisores asignados -->
<ul class="list-group" id="user_sups">
<li class="list-group-item" ng-repeat="sup in studentSupervisors">
<!-- Imagen de perfil del supervisor -->
<img ng-src="{{sup.pic}}" class="profile" alt="" title="" />
{{sup.name}} {{sup.surname}}
<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>
</ul>
<!-- Fin de Supervisores asignados -->
</div> </div>
<!-- Fin de buscador de tutores --> <!-- Fin de id student-sups -->
</div>
<div class="col-md-4">
<!-- Tutores (Padres) -->
<div id="student_tutors" ng-if="studentData.supervision != 1">
<legend translate>tutors</legend>
<!-- Buscador de tutores -->
<p>
<form role="search" ng-submit="search_tutor()">
<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">
<span class="glyphicon glyphicon-search"></span>
</button>
</div>
</div>
</form>
</p>
<!-- Tutores asignados --> <!-- Alert and success messages for tutor found -->
<ul class="list-group" id="user_tutors"> <div ng-show="{{ 'showmessagetutorfound' }}" class="alert alert-info">
<li class="list-group-item" ng-repeat="tutor in studentTutors">
<!-- Imagen de perfil del tutor --> <!-- Imagen de perfil del tutor -->
<img ng-src="{{tutor.pic}}" class="profile" alt="" title="" /> <img ng-src="{{tutorToAdd.pic}}" class="profile" alt="" title="" />
{{tutor.name}} {{tutor.surname}} {{ tutorToAdd.name }} {{ tutorToAdd.surname }}
<a ng-if="user.isSupAdmin" ng-click="delete_tutor(tutor.id)" class="delete_tutor" title="{{ 'unlink' | translate}}"> <a class="btn btn-default btn-sm pull-right" role="button" ng-click="add_tutor()" translate>add</a>
<span class="color_red glyphicon glyphicon-remove-circle" aria-hidden="true"></span> </div>
</a> <!-- Fin de buscador de tutores -->
</li>
</ul> <!-- Tutores asignados -->
<!-- Fin de Tutores asignados --> <ul class="list-group" id="user_tutors">
<li class="list-group-item" ng-repeat="tutor in studentTutors">
<!-- Info message --> <!-- Imagen de perfil del tutor -->
<div class="alert alert-info">{{ 'supervisor_note' | translate }}</div> <img ng-src="{{tutor.pic}}" class="profile" alt="" title="" />
{{tutor.name}} {{tutor.surname}}
<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>
</ul>
<!-- Fin de Tutores asignados -->
<!-- Info message -->
<div class="alert alert-info">{{ 'supervisor_note' | translate }}</div>
</div>
<!-- Fin de id student-tutors -->
</div> </div>
<!-- Fin de id student-tutors -->
</div> </div>
</div> </div> <!-- /supervisores -->
<!-- Fin de row -->
</div> </div>
<!-- Fin de panel body --> <!-- Fin de panel body -->
</div> </div>
......
sails/src/assets/scripts/modules/supervisor/views/header.html
...@@ -28,13 +28,13 @@ ...@@ -28,13 +28,13 @@
<ul class="dropdown-menu" role="menu"> <ul class="dropdown-menu" role="menu">
<li> <li>
<a class="pointer" role="menuitem" tabindex="0" href="/app/#/students"> <a class="pointer" role="menuitem" tabindex="0" href="/app/#/students">
<i class="glyphicon glyphicon-user" aria-hidden="true"></i> <i class="fa fa-users" aria-hidden="true"></i>
{{ 'students' | translate }} {{ 'students' | translate }}
</a> </a>
</li> </li>
<li> <li>
<a class="pointer" role="menuitem" tabindex="0" href="/app/#/supervisors_list"> <a class="pointer" role="menuitem" tabindex="0" href="/app/#/supervisors_list">
<i class="glyphicon glyphicon-star" aria-hidden="true"></i> <i class="fa fa-users" aria-hidden="true"></i>
{{ 'supervisors' | translate }} {{ 'supervisors' | translate }}
</a> </a>
<li ng-if="user.isTutor == false"> <li ng-if="user.isTutor == false">
......
sails/src/assets/scripts/modules/supervisor/views/students.html
...@@ -61,9 +61,9 @@ ...@@ -61,9 +61,9 @@
<span class="btn btn-default btn-lg" role="button" alt="{{ 'session' | translate}}" popover="{{ 'session' | translate}}" popover-trigger="mouseenter" ng-if="student.supervision != 2"><span class="glyphicon glyphicon-transfer" aria-hidden="true" style="color: #bbb"></span></span> <span class="btn btn-default btn-lg" role="button" alt="{{ 'session' | translate}}" popover="{{ 'session' | translate}}" popover-trigger="mouseenter" ng-if="student.supervision != 2"><span class="glyphicon glyphicon-transfer" aria-hidden="true" style="color: #bbb"></span></span>
<a class="btn btn-default btn-lg" role="button" href="/app/#/student/{{student.id}}/reports" alt="{{ 'reports' | translate}}" popover="{{ 'reports' | translate}}" popover-trigger="mouseenter" ng-if="student.supervision != 1"><span class="glyphicon glyphicon-file" aria-hidden="true"></span></a> <a class="btn btn-default btn-lg" role="button" href="/app/#/student/{{student.id}}/reports" alt="{{ 'reports' | translate}}" popover="{{ 'reports' | translate}}" popover-trigger="mouseenter" ng-if="student.supervision != 1"><i class="fa fa-bar-chart" aria-hidden="true"></i></a>
<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> <span class="btn btn-default btn-lg" role="button" alt="{{ 'reports' | translate}}" popover="{{ 'reports' | translate}}" popover-trigger="mouseenter" ng-if="student.supervision == 1"><i class="fa fa-bar-chart" aria-hidden="true" style="color: #bbb"></i></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"><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>
......
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