Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
yotta
/
pictogram
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
60
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
6c3b3172
authored
Dec 17, 2016
by
Arturo Montejo Ráez
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
license field added with mask
parent
ae2c93b7
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
16 additions
and
3 deletions
sails/src/assets/app/bower.json
sails/src/assets/app/i18n/en-gb.json
sails/src/assets/app/i18n/es-es.json
sails/src/assets/scripts/modules/student/controllers/setup.js
sails/src/assets/scripts/modules/student/views/setup.html
sails/src/tasks/config/concat.js
sails/src/assets/app/bower.json
View file @
6c3b3172
...
...
@@ -28,7 +28,8 @@
"angular-sanitize"
:
"~1.4.1"
,
"angular-chart.js"
:
"latest"
,
"ng-lodash"
:
"~0.3.0"
,
"bootstrap-filestyle"
:
"~1.2.1"
"bootstrap-filestyle"
:
"~1.2.1"
,
"jquery.maskedinput"
:
"~1.4.1"
},
"resolutions"
:
{
"angular"
:
">=1 <1.3.0"
,
...
...
sails/src/assets/app/i18n/en-gb.json
View file @
6c3b3172
...
...
@@ -133,6 +133,7 @@
"licenses"
:
"Licenses"
,
"license_created"
:
"License created"
,
"licenses_left"
:
"{{number}} licenses left"
,
"license_number"
:
"License number"
,
"light_up"
:
"Light up"
,
"link"
:
"Link"
,
"loading_pictos"
:
"Loading pictos"
,
...
...
@@ -284,6 +285,7 @@
"supervisor_note"
:
"If the parent aren't going to register in the platform, the administrator can use the notes field to store their information."
,
"supervisor_updated"
:
"Supervisor updated"
,
"supervisors"
:
"Therapist"
,
"supervisors_setup"
:
"Supervisors"
,
"surname"
:
"Surname"
,
"tag_deleted"
:
"Tag deleted"
,
"tape_background"
:
"Tape background"
,
...
...
sails/src/assets/app/i18n/es-es.json
View file @
6c3b3172
...
...
@@ -133,6 +133,7 @@
"licenses"
:
"Licencias"
,
"licenses_left"
:
"{{number}} licencias disponibles"
,
"license_created"
:
"Licencia creada"
,
"license_number"
:
"Número de licencia"
,
"light_up"
:
"Iluminar"
,
"link"
:
"Vincular"
,
"loading_pictos"
:
"Cargando pictos"
,
...
...
@@ -285,6 +286,7 @@
"supervisor_note"
:
"Si los padres no se van a dar de alta en la plataforma nunca, el administrador puede anotar la información de contacto en el campo notas."
,
"supervisor_updated"
:
"Supervisor actualizado"
,
"supervisors"
:
"Terapeutas"
,
"supervisors_setup"
:
"Supervisores"
,
"surname"
:
"Apellidos"
,
"tag_deleted"
:
"Etiqueta borrada"
,
"tape_background"
:
"Fondo de la cinta"
,
...
...
sails/src/assets/scripts/modules/student/controllers/setup.js
View file @
6c3b3172
...
...
@@ -23,6 +23,9 @@ dashboardControllers.controller('StudentSetupCtrl', function StudentSetupCtrl(
input
:
false
});
// Set mask for license number input field
$
(
"#setup_license"
).
mask
(
"****-****-****-****"
);
/**
* Updates the student picture
* @param {Angular file array} $files Image to be uploaded
...
...
sails/src/assets/scripts/modules/student/views/setup.html
View file @
6c3b3172
...
...
@@ -34,6 +34,9 @@
<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"
>
<input
type=
"text"
class=
"form-control"
style=
"text-transform: uppercase"
id=
"setup_license"
placeholder=
"{{ 'license_number' | translate }}"
required
ng-model=
"formUser.license"
/>
</div>
</fieldset>
</div>
...
...
@@ -339,10 +342,10 @@
<!-- Parte derecha: Tutores y dispositivos -->
<h3>
{{ 'supervisors' | translate }}
</h3>
<!-- Supervisores (terapeutas) del alumno -->
<div
id=
"student_sups"
ng-if=
"studentData.supervision != 1"
>
<legend
translate
>
supervisors
</legend>
<legend
translate
>
supervisors
_setup
</legend>
<!-- Buscador de supervisores -->
<p>
<form
role=
"search"
ng-submit=
"search_sup()"
>
...
...
sails/src/tasks/config/concat.js
View file @
6c3b3172
...
...
@@ -26,6 +26,8 @@ module.exports = function (grunt) {
'assets/app/bower_components/ng-lodash/build/ng-lodash.js'
,
'assets/app/bower_components/ng-file-upload/angular-file-upload-shim.js'
,
'assets/app/bower_components/bootstrap-filestyle/src/bootstrap-filestyle.min.js'
,
'assets/app/bower_components/jquery.maskedinput/dist/jquery.maskedinput.min.js'
,
'assets/scripts/lib/sails.io.js'
];
var
jsFiles
=
[
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment