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 46 additions and 155 deletions
sails/src/assets/app/i18n/en-gb.json
......@@ -78,6 +78,7 @@
"delete_strip_after_delivery": "Empty strip after delivery",
"delete_template": "Delete from templates",
"description": "Description",
"device": "Device",
"device_setup": "Device setup",
"disabled": "Disabled. Clic for invisible",
"disclaimer": "Conditions of use",
......
sails/src/assets/app/i18n/es-es.json
......@@ -78,6 +78,7 @@
"delete_strip_after_delivery": "Limpiar cinta tras entrega",
"delete_template": "Eliminar de plantillas",
"description": "Descripción",
"device": "Dispositivo",
"device_setup": "Configuración del dispositivo",
"disabled": "Desactivado. Clic para invisible",
"disclaimer": "Condiciones de uso",
......
sails/src/assets/scripts/modules/student/controllers/setup.js
......@@ -26,6 +26,7 @@ dashboardControllers.controller('StudentSetupCtrl', function StudentSetupCtrl(
});*/
$scope.supsForm = {};
$scope.section = 'account';
$scope.changeImg = function () {
......
sails/src/assets/scripts/modules/student/views/header.html
......@@ -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>
</li>
<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 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'"
><span class="glyphicon glyphicon-cog" aria-hidden="true"></span> {{ 'setup' | translate }}</a>
</li>
......
sails/src/assets/scripts/modules/student/views/setup.html
<div class="panel panel-default student_tab_panel">
<div class="panel-body">
<div class="row">
<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" ng-show="section == 'account'">
<!-- 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="row">
<div class="col-md-6">
<div id="student_personal_edit">
<form role="form" ng-submit="updateStudent()">
<!-- Preview -->
<img class="thumbnail preview" ng-src="{{studentData.pic}}" />
......@@ -20,8 +31,9 @@
<span class="glyphicon glyphicon-folder-open"></span> {{ 'change_picture' | translate }}
</button>
</div>
</div>
</div>
<div class="col-md-6">
<fieldset>
......@@ -50,10 +62,13 @@
</span>
</div>
</fieldset>
</div>
</div>
</div>
<div class="col-md-6">
<fieldset>
<legend translate>personal_data</legend>
......@@ -124,20 +139,20 @@
</div>
</form>
</div>
<!-- Fin de student_personal_edit -->
</div>
</div> <!-- Fin de student_personal_edit -->
<!-- Configuración dispositivo -->
<div id="device_setup" ng-show="section == 'device'">
<div class="row">
<div class="col-md-6">
<div id="device_setup">
<legend translate>device_setup</legend>
</div>
</div>
<div class="row">
<div class="col-md-6">
<form role="form" class="form">
<div class="col-md-3">
<fieldset>
<div class="form-group">
<label translate>categories</label>
......@@ -179,10 +194,8 @@
</div>
</div>
</fieldset>
</div>
<div class="col-md-6">
<div class="col-md-3">
<fieldset>
<label translate>feedback_picto</label>
<div class="input-group">
......@@ -235,144 +248,18 @@
</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>
</fieldset>
</fieldset>
-->
</form>
</div>
</div>
</div>
<!-- /configuración dispositivo -->
<!-- Tutores y dispositivos -->
<div id="supervisors_section" ng-show="section == 'supervisors'">
<!-- Parte derecha: Tutores y dispositivos -->
<div class="row">
<div class="col-md-4" ng-if="studentData.supervision != 1">
<!-- Supervisores (terapeutas) del alumno -->
<div id="student_sups" ng-if="studentData.supervision != 1">
<div id="student_sups">
<legend translate>therapists</legend>
<!-- Buscador de supervisores -->
<p>
......@@ -410,6 +297,8 @@
<!-- Fin de Supervisores asignados -->
</div>
<!-- Fin de id student-sups -->
</div>
<div class="col-md-4">
<!-- Tutores (Padres) -->
<div id="student_tutors" ng-if="studentData.supervision != 1">
......@@ -454,10 +343,9 @@
<div class="alert alert-info">{{ 'supervisor_note' | translate }}</div>
</div>
<!-- Fin de id student-tutors -->
</div>
</div>
<!-- Fin de row -->
</div> <!-- /supervisores -->
</div>
<!-- Fin de panel body -->
</div>
......
sails/src/assets/scripts/modules/supervisor/views/header.html
......@@ -28,13 +28,13 @@
<ul class="dropdown-menu" role="menu">
<li>
<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 }}
</a>
</li>
<li>
<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 }}
</a>
<li ng-if="user.isTutor == false">
......
sails/src/assets/scripts/modules/supervisor/views/students.html
......@@ -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>
<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>
......
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