Skip to content

yotta / pictogram

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

sliding finished in new student account

parent 4ad0f3dc
Inline Side-by-side
Showing with 81 additions and 31 deletions
sails/src/assets/app/i18n/en-gb.json
......@@ -13,8 +13,10 @@
"action-unshow": "Writing mode",
"activation": "Activation",
"add": "Add",
"add_existing": "Add existing account",
"add_expression": "Add expression",
"add_instruction": "Add instruction",
"add_new_official": "New official account",
"add_office": "Add office",
"add_picto": "Add pictogram",
"add_pictos": "Add pictograms",
......@@ -237,6 +239,7 @@
"new_scene_with_categories": "Create scene with categories",
"new_scene_without_categories": "Create scene without categories",
"new_session": "New session",
"new_test_account": "New test account",
"next": "Next",
"next_actions": "Next actions",
"next_sessions": "Next sessions",
......@@ -261,9 +264,11 @@
"objetive": "Objetive",
"October": "October",
"office": "Office",
"office_account_desc": "Manage students and intervention teams, along with all therapist related functionalities.",
"office_added": "Office added",
"office_center": "Office or center",
"office_deleted": "Office deleted",
"office_name": "Office's name",
"office_not_added": "Office not added",
"office_not_deleted": "Office not deleted",
"office_not_updated": "Office not updated",
......@@ -340,6 +345,7 @@
"search_sup_email": "Search supervisor by email",
"search_tutor_email": "Search tutor by email",
"seconds": "seconds",
"select_account": "Select account type",
"select_instruction": "-- Select an instruction --",
"select_a_method": "-- Select a method --",
"select_method": "-- Select a method or create it --",
......@@ -380,6 +386,7 @@
"state_spontaneous": "Spontaneous",
"state_supervised": "Supervised",
"stop": "Stop",
"student_account_confirm": "The new account is now available from the students list.",
"student_added": "Student added",
"student_already_exists": "A student with that username already exists, please try with another one",
"student_deleted": "Student deleted",
......@@ -407,6 +414,7 @@
"tape_background": "Tape background",
"template_deleted": "Template deleted",
"therapist": "Therapist",
"therapist_account_desc": "Manage pictograms, devices, record therapy sessions and get evolution reports.",
"therapists": "Therapists",
"time_hours": "Time: {{hours}} hours",
"time_instruction_method": "Time instructions of method",
......@@ -431,6 +439,7 @@
"tries_per_months": "Tries per months in",
"tries_results_instruction": "Tries results in instruction",
"tutor_added": "Tutor added to the student",
"tutor_account_desc": "Manage child's pictograms and configure his/her communication device.",
"tutor_deleted": "Tutor removed from the student",
"tutor_not_added": "Tutor not added to the student.",
"tutor_not_deleted": "Tutor couldn't be removed from the student",
......@@ -444,7 +453,8 @@
"update_supervisor": "Update supervisor",
"upload_image": "Upload image",
"use_categories": "Use categories",
"username": "Name of account (no spaces)",
"username": "Account identifier",
"username_default": "Account identifier (don't use spaces)",
"username_exists": "There is already an account with name '{{username}}'",
"user_created": "Account created!",
"user_created_text": "An email with instructions to activate the account has been sent to {{email}}.",
......
sails/src/assets/app/i18n/es-es.json
......@@ -13,8 +13,10 @@
"action-unshow": "Modo escritura",
"activation": "Activación",
"add": "Añadir",
"add_existing": "Asociar cuenta existente",
"add_expression": "Añadir expresión",
"add_instruction": "Añadir instrucción",
"add_new_official": "Nueva cuenta oficial",
"add_office": "Añadir gabinete",
"add_picto": "Añadir pictograma",
"add_pictos": "Añadir pictogramas",
......@@ -237,6 +239,7 @@
"new_scene_with_categories": "Crear escena con categorías",
"new_scene_without_categories": "Crear escena sin categorías",
"new_session": "Nueva sesión",
"new_test_account": "Crear cuenta de prueba",
"next": "Siguiente",
"next_actions": "Acciones posteriores",
"next_sessions": "Sesiones posteriores",
......@@ -261,9 +264,11 @@
"objetive": "Objetivo",
"October": "Octubre",
"office": "Gabinete",
"office_account_desc": "Gestione alumnos y equipos de intervención, además de todas las funcionalidades propias de un terapeuta.",
"office_center": "Gabinete/centro",
"office_added": "Gabinete añadido",
"office_deleted": "Gabinete eliminado",
"office_name": "Nombre del centro/gabinete",
"office_not_added": "No se ha podido añadir el gabinete",
"office_not_deleted": "No se ha podido eliminar el gabinete",
"office_not_updated": "El gabinete no se ha podido actualizar",
......@@ -341,6 +346,7 @@
"search_tutor_email": "Buscar tutor por email",
"seconds": "segundos",
"select_instruction": "-- Selecciona una instrucción --",
"select_account": "Seleccione tipo de cuenta",
"select_a_method": "-- Selecciona un método --",
"select_method": "-- Selecciona un método o créalo --",
"select_office": "Seleccione una oficina/centro de la lista",
......@@ -380,6 +386,7 @@
"state_spontaneous": "Espontáneo",
"state_supervised": "Guiado",
"stop": "Parar",
"student_account_confirm": "La nueva cuenta ahora está disponible en su lista de alumnos.",
"student_added": "Estudiante añadido",
"student_already_exists": "Ya existe un estudiante con ese nombre de usuario. Por favor, inténtelo de nuevo con algo diferente.",
"student_deleted": "Estudiante eliminado",
......@@ -408,6 +415,7 @@
"template_deleted": "Plantilla eliminada",
"therapists": "Terapeutas",
"therapist": "Terapeuta",
"therapist_account_desc": "Gestione pictogramas, dispositivos, grabe sesiones de terapia y obtenga estadísticas de evolución.",
"time_hours": "Tiempo: {{hours}} horas",
"time_instruction_method": "Tiempo instrucciones del método",
"time_sessions_total": "Tiempo total de sesiones",
......@@ -430,6 +438,7 @@
"tries_per_instruction_method": "Ensayos por instrucción del método",
"tries_per_months": "Número de ensayos por meses en",
"tries_results_instruction": "Resultados ensayos en instrucción",
"tutor_account_desc": "Gestione los pictogramas de su hijo o hija y configure su dispositivo de comunicación.",
"tutor_added": "Tutor añadido al estudiante",
"tutor_deleted": "Tutor desvinculado del estudiante",
"tutor_not_added": "El tutor no se ha podido añadir al estudiante",
......@@ -444,7 +453,8 @@
"update_supervisor": "Editar supervisor",
"upload_image": "Subir imagen",
"use_categories": "Usar categorías",
"username": "Nombre cuenta (sin espacios)",
"username": "Identificador de cuenta",
"username_default": "Identificador cuenta (no use espacios)",
"username_exists": "Ya existe un usuario con nombre de cuenta '{{username}}'",
"user_created": "¡Cuenta creada!",
"user_created_text": "Se ha enviado un email de confirmación para activar su cuenta a la dirección {{email}}.",
......
sails/src/assets/scripts/modules/login/views/login.html
......@@ -16,7 +16,7 @@
<div class="col-md-2">
</div>
<div class="col-md-8">
<div class="switch-panel-body" ng-switch="slide.state">
<div class="switch-panel-body height600" ng-switch="slide.state">
<!--
SLIDE 1: login pane
......@@ -90,7 +90,7 @@
SLIDE 2: Account selection
-->
<div ng-class="slide.back ? 'switch-animation-back' : 'switch-animation'" ng-switch-when="accounts">
<h2>Elija el tipo de cuenta</h2>
<h2 translate>select_account</h2>
<div class="row">
<div class="col-md-4">
<legend translate>parents_tutor</legend>
......@@ -98,7 +98,7 @@
<a ng-click="slide.rightTo('tutor')"><img src="img/parents.png" alt="{{'parents_tutor' | translate}}" title="{{'parents_tutor' | translate}}" /></a>
</div>
<div>
<p>Gestione los pictogramas de su hijo o hija y configure su dispositivo de comunicación.</p>
<p translate>tutor_account_desc</p>
</div>
</div>
<div class="col-md-4">
......@@ -107,7 +107,7 @@
<a ng-click="slide.rightTo('therapist')"><img src="img/therapist.png" alt="{{'therapist' | translate}}" title="{{'therapist' | translate}}" /></a>
</div>
<div>
<p>Gestione pictogramas, dispositivos, grabe sesiones de terapia y obtenga estadísticas de evolución.</p>
<p translate>therapist_account_desc</p>
</div>
</div>
<div class="col-md-4">
......@@ -116,7 +116,7 @@
<a ng-click="slide.rightTo('office')"><img src="img/office.jpg" alt="{{'office_center' | translate}}" title="{{'office_center' | translate}}" /></a>
</div>
<div>
<p>Gestione alumnos y equipos de intervención, además de todas las funcionalidades propias de un terapeuta.</p>
<p translate>office_account_desc</p>
</div>
</div>
</div>
......@@ -134,9 +134,11 @@
<div class="form-group col-md-4" id="tutor_form">
<input type="hidden" ng-model="formdata.role" value="tutor"></input>
<div class="form-group">
<label translate>email</label>
<input type="email" class="form-control" placeholder="{{ 'email' | translate }}" ng-model="formdata.email"/>
</div>
<fieldset>
<label translate>password</label>
<span class="color_red text_sm pull-right" ng-show="formdata.password != formdata.password_confirm" translate>password_match</span>
<div class="form-group">
<input type="password" class="form-control" id="signin_password1" placeholder="{{ 'password_type' | translate }}"/>
......@@ -178,11 +180,12 @@
<img src="img/therapist.png" alt="{{'therapist' | translate}}" title="{{'therapist' | translate}}" />
</div>
<div class="form-group col-md-4" id="tutor_form">
<input type="hidden" ng-model="formdata.role" value="therapist"></input>
<div class="form-group">
<label translate>email</label>
<input type="email" class="form-control" placeholder="{{ 'email' | translate }}" ng-model="formdata.office.email"/>
</div>
<fieldset>
<label translate>password</label>
<span class="color_red text_sm pull-right" ng-show="formdata.password != formdata.password_confirm" translate>password_match</span>
<div class="form-group">
<input type="password" class="form-control" id="signin_password1" placeholder="{{ 'password_type' | translate }}"/>
......@@ -206,7 +209,7 @@
<button class="btn btn-default" ng-click="slide.leftTo('accounts')">&lt;&lt; {{ 'back' | translate }} </button>
</div>
<div class="col-md-4">
<button class="btn btn-primary float-right" ng-click="slide.rightTo('confirmation')">{{ 'create_account' | translate }} &gt;&gt; </button>
<button class="btn btn-primary float-right" ng-click="slide.rightTo('confirmation'); formdata.role = 'therapist'">{{ 'create_account' | translate }} &gt;&gt; </button>
</div>
</div>
</div>
......@@ -224,12 +227,15 @@
<input type="hidden" ng-model="formdata.role" value="office"></input>
<div class="form-group">
<input type="text" class="form-control" placeholder="{{ 'name' | translate }}" ng-model="formdata.office.name"/>
<label translate>office_name</label>
<input type="text" class="form-control" placeholder="{{ 'office_name' | translate }}" ng-model="formdata.office.name"/>
</div>
<div class="form-group">
<label translate>email</label>
<input type="email" class="form-control" placeholder="{{ 'email' | translate }}" ng-model="formdata.office.email"/>
</div>
<fieldset>
<label translate>password</label>
<span class="color_red text_sm pull-right" ng-show="formdata.password != formdata.password_confirm" translate>password_match</span>
<div class="form-group">
<input type="password" class="form-control" id="signin_password1" placeholder="{{ 'password_type' | translate }}"/>
......@@ -267,7 +273,7 @@
<h2>{{ 'user_created' | translate }} </h2>
<p> {{ 'user_created_text' | translate }} </p>
<br>
<img src="img/child.jpg"/>
<img src="img/child.png"/>
</div>
......
sails/src/assets/scripts/modules/supervisor/controllers/students.js
......@@ -76,7 +76,7 @@ dashboardControllers.controller('StudentsCtrl', function StudentsCtrl(
});
// Reset form Student
$scope.resetForm = function () {
$scope.showForm = function () {
// Empty the form
$scope.formdatastudent = {
username: '',
......@@ -94,8 +94,19 @@ dashboardControllers.controller('StudentsCtrl', function StudentsCtrl(
current_instruction: 'no_instruction',
license_number: ''
};
$scope.slide.state ='accounts';
$scope.slide.show = true;
$('#addform').slideDown('slow', function() {});
};
$scope.hideForm = function () {
$('#addform').slideUp('slow', function() {
$scope.slide.show = false;
$scope.$apply();
});
}
/**
* Add Student
*/
......
sails/src/assets/scripts/modules/supervisor/views/students.html
......@@ -6,14 +6,13 @@
<div class="panel-body">
<!-- Add Student Form -->
<div ng-include="'modules/supervisor/views/students_add.html'" ng-show="slide.show"></div>
<div ng-include="'modules/supervisor/views/students_add.html'" hidden="true" id="addform"></div>
<!-- Add Student button and Search row -->
<div class="row">
<div class="col-xs-3">
{{ showadd }}
<p class="text-left" ng-show="!slide.show">
<a ng-click="resetForm(); slide.show = true; slide.state='accounts'"" class="btn btn-success btn-sm" role="button">
<p class="text-left" ng-hide="slide.show">
<a ng-click="showForm()" class="btn btn-success btn-sm" role="button">
<span class="glyphicon glyphicon-plus" aria-hidden="true"></span> {{ 'add_student' | translate }}
</a>
</p>
......
sails/src/assets/scripts/modules/supervisor/views/students_add.html
<div class="row">
<div class="col-xs-3">
<p class="text-left" ng-show="slide.show">
<a ng-click="slide.show = false" class="btn btn-default btm-sm" role="button">
<p class="text-left">
<a ng-click="hideForm()" class="btn btn-danger btn-sm" role="button">
<span class="glyphicon glyphicon-remove" aria-hidden="true"></span> {{ 'close' | translate }}
</a>
</p>
</div>
<div class="col-xs-9"></div>
</div>
<form name="AddStudentForm" role="form" ng-submit="add_student()" ng-controller="StudentAddCtrl">
<div class="switch-panel-body" ng-switch="slide.state">
<div class="switch-panel-body height400" ng-switch="slide.state">
<!--
SLIDE 1: Account type selection
......@@ -18,16 +19,16 @@
<div ng-class="slide.back ? 'switch-animation-back' : 'switch-animation'" ng-switch-when="accounts">
<div class="row">
<div class="col-md-4">
<legend translate>Asociar cuenta existente</legend>
<legend translate>add_existing</legend>
<div class="text-center">
<a ng-click="slide.rightTo('existing')"><img src="img/child-existing.png" alt="{{'parents_tutor' | translate}}" title="{{'parents_tutor' | translate}}" /></a>
</div>
<div>
<p>Asocie a su perfil la cuenta de un/a alumno/a ya registrado/a para poder gestionarla.</p>
<p>Asocie a su perfil la cuenta de un/a alumno/a ya registrado/a para poder gestionarla. Necesitará el número de licencia en uso del estudiante.</p>
</div>
</div>
<div class="col-md-4">
<legend translate>Nueva cuenta oficial</legend>
<legend translate>add_new_official</legend>
<div class="text-center">
<a ng-click="slide.rightTo('new')"><img src="img/child-new.png" alt="{{'therapist' | translate}}" title="{{'therapist' | translate}}" /></a>
</div>
......@@ -36,12 +37,12 @@
</div>
</div>
<div class="col-md-4">
<legend translate>Crear cuenta de prueba</legend>
<legend translate>new_test_account</legend>
<div class="text-center">
<a ng-click="slide.rightTo('test')"><img src="img/child-test.png" alt="{{'office_center' | translate}}" title="{{'office_center' | translate}}" /></a>
</div>
<div>
<p>Cree una cuenta temporal para probar gratuitamente Pictogram. Puede activar una licencia en esta cuenta para mantenerla más allá de los tres meses de prueba.</p>
<p>Cree una cuenta temporal para probar gratuitamente Pictogram. Podrá activar una licencia en esta cuenta para mantenerla más allá de los tres meses de prueba.</p>
</div>
</div>
</div>
......@@ -51,12 +52,13 @@
SLIDE 2: Associate existing account
-->
<div ng-class="slide.back ? 'switch-animation-back' : 'switch-animation'" ng-switch-when="existing">
<legend translate>Asociar cuenta de alumno/a</legend>
<legend translate>add_existing</legend>
<div class="row">
<div class="col-md-4 col-md-offset-2 text-center">
<img src="img/child-existing.png" alt="{{'parents_tutor' | translate}}" title="{{'parents_tutor' | translate}}" />
</div>
<div class="form-group col-md-4">
<label translate>license_number</label>
<input class="form-control" type="text" id="student_license" mask="wwww-wwww-wwww-wwww" clean="true" placeholder="{{ 'license_number' | translate }}" ng-model="formdatastudent.license_number" required>
</div>
</div>
......@@ -75,22 +77,25 @@
SLIDE 3: New official account
-->
<div ng-class="slide.back ? 'switch-animation-back' : 'switch-animation'" ng-switch-when="new">
<legend translate>Crear nueva cuenta oficial</legend>
<legend translate>add_new_official</legend>
<div class="row">
<div class="col-md-4 col-md-offset-2 text-center">
<img src="img/child-new.png" alt="{{'therapist' | translate}}" title="{{'therapist' | translate}}" />
</div>
<div class="form-group col-md-4">
<div class="form-group">
<input type="username" class="form-control" id="setup_username" placeholder="{{ 'username' | translate }}" required ng-model="formdatastudent.username" />
<label translate>username</label>
<input type="username" class="form-control" id="setup_username" placeholder="{{ 'username_default' | translate }}" required ng-model="formdatastudent.username" />
</div>
<div class="form-group">
<label translate>password</label>
<input type="password" class="form-control" id="setup_password1" placeholder="{{ 'password_new_type' | translate }}" ng-model="formdatastudent.password" required />
</div>
<div class="form-group">
<input type="password" class="form-control" id="setup_password2" placeholder="{{ 'password_confirm' | translate }}" ng-model="formdatastudent.password_confirm" required />
</div>
<div class="form-group">
<label translate>license_number</label>
<input class="form-control" type="text" id="student_license" mask="wwww-wwww-wwww-wwww" clean="true" placeholder="{{ 'license_number' | translate }}" ng-model="formdatastudent.license_number" required>
</div>
</div>
......@@ -109,16 +114,18 @@
SLIDE 5: Office account form
-->
<div ng-class="slide.back ? 'switch-animation-back' : 'switch-animation'" ng-switch-when="test">
<legend translate>Crear cuenta de prueba</legend>
<legend translate>new_test_account</legend>
<div class="row">
<div class="col-md-4 col-md-offset-2 text-center">
<img src="img/child-test.png" alt="{{'office_center' | translate}}" title="{{'office_center' | translate}}" />
</div>
<div class="form-group col-md-4" id="office_form">
<div class="form-group">
<input type="username" class="form-control" id="setup_username" placeholder="{{ 'username' | translate }}" required ng-model="formdatastudent.username" />
<label translate>username</label>
<input type="username" class="form-control" id="setup_username" placeholder="{{ 'username_default' | translate }}" required ng-model="formdatastudent.username" />
</div>
<div class="form-group">
<label translate>password</label>
<input type="password" class="form-control" id="setup_password1" placeholder="{{ 'password_new_type' | translate }}" ng-model="formdatastudent.password" required />
</div>
<div class="form-group">
......@@ -143,7 +150,7 @@
<div ng-class="slide.back ? 'switch-animation-back' : 'switch-animation'" ng-switch-when="confirmation">
<h2>{{ 'user_created' | translate }} </h2>
<p>La nueva cuenta ya está disponible en su lista de alumnos.</p>
<p translate>student_account_confirm</p>
<br>
<img src="img/child.png"/>
......
sails/src/assets/styles/main.css
......@@ -1107,11 +1107,18 @@ input.editable.scene-name {
.switch-panel-body {
position:relative;
width: 930px;
height: 500px;
margin: auto;
overflow:hidden;
}
.height600 {
height: 600px;
}
.height400 {
height: 400px;
}
.switch-animation,
.switch-animation-back {
width: 900px;
......
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