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
304b2851
authored
Apr 21, 2017
by
Jose Antonio
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Translations and setup student
parent
393cabac
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
25 additions
and
16 deletions
sails/src/CHANGES.md
sails/src/assets/app/i18n/en-gb.json
sails/src/assets/app/i18n/es-es.json
sails/src/assets/scripts/modules/student/controllers/collections.js
sails/src/assets/scripts/modules/student/views/setup.html
sails/src/CHANGES.md
View file @
304b2851
...
@@ -41,6 +41,9 @@ Changes to be performed manually in servers to upgrade
...
@@ -41,6 +41,9 @@ Changes to be performed manually in servers to upgrade
-
load default scenes procedure
-
load default scenes procedure
`source /vagrant/roles/database/files/scene_adapt.sql`
`source /vagrant/roles/database/files/scene_adapt.sql`
-
Reload enrolments trigger
`source /vagrant/roles/database/files/triggers-enrolments-integrity-constraints.sql;`
(already done in dev & pre)
(already done in dev & pre)
-
add new column to license:
-
add new column to license:
...
...
sails/src/assets/app/i18n/en-gb.json
View file @
304b2851
...
@@ -46,6 +46,7 @@
...
@@ -46,6 +46,7 @@
"birthdate"
:
"Birthdate"
,
"birthdate"
:
"Birthdate"
,
"black_and_white"
:
"B&W"
,
"black_and_white"
:
"B&W"
,
"cancel"
:
"Cancel"
,
"cancel"
:
"Cancel"
,
"cant_delete_active_scene"
:
"Active scene could not be deleted, deactive it first"
,
"cannot_delete_method"
:
"Method could not be deleted, maybe due to existing recorded sessions."
,
"cannot_delete_method"
:
"Method could not be deleted, maybe due to existing recorded sessions."
,
"cannot_delete_instruction"
:
"Instruction could not be deleted, maybe due to existing recorded sessions."
,
"cannot_delete_instruction"
:
"Instruction could not be deleted, maybe due to existing recorded sessions."
,
"case_requested"
:
"Please, specify your user case"
,
"case_requested"
:
"Please, specify your user case"
,
...
@@ -132,6 +133,8 @@
...
@@ -132,6 +133,8 @@
"error_on_upload"
:
"Error on image upload. The maximum allowed size for images is 1 MB."
,
"error_on_upload"
:
"Error on image upload. The maximum allowed size for images is 1 MB."
,
"error_on_update"
:
"Error on update"
,
"error_on_update"
:
"Error on update"
,
"error_loading_pictos"
:
"Error loading pictos information"
,
"error_loading_pictos"
:
"Error loading pictos information"
,
"error_loading_scene"
:
"Error loading scene data"
,
"error_loading_scenes"
:
"Error loading scenes data"
,
"error_general"
:
"An error has been produced"
,
"error_general"
:
"An error has been produced"
,
"error_rate"
:
"Error rate"
,
"error_rate"
:
"Error rate"
,
"expand_navigation"
:
"Expand navigation"
,
"expand_navigation"
:
"Expand navigation"
,
...
@@ -298,6 +301,7 @@
...
@@ -298,6 +301,7 @@
"read_picto"
:
"Read picto"
,
"read_picto"
:
"Read picto"
,
"register"
:
"Sign in"
,
"register"
:
"Sign in"
,
"reloading_pictos"
:
"Reloading pictograms"
,
"reloading_pictos"
:
"Reloading pictograms"
,
"reload_scene"
:
"Reloading scene"
,
"remember"
:
"Remember me"
,
"remember"
:
"Remember me"
,
"reports"
:
"Reports"
,
"reports"
:
"Reports"
,
"request_change_password"
:
"Request change password"
,
"request_change_password"
:
"Request change password"
,
...
@@ -305,6 +309,11 @@
...
@@ -305,6 +309,11 @@
"room_changed"
:
"A partner is offline. Session paused."
,
"room_changed"
:
"A partner is offline. Session paused."
,
"save"
:
"Save"
,
"save"
:
"Save"
,
"save_as_template"
:
"Save as template"
,
"save_as_template"
:
"Save as template"
,
"scene_added"
:
"Scene data has been saved"
,
"scene_already_deleted"
:
"Scene was already deleted"
,
"scene_deleted"
:
"Scene has been deleted"
,
"scene_duplicated"
:
"Scene has been copied"
,
"scene_updated"
:
"Scene data updated"
,
"search"
:
"Search"
,
"search"
:
"Search"
,
"search_sup_email"
:
"Search supervisor by email"
,
"search_sup_email"
:
"Search supervisor by email"
,
"search_tutor_email"
:
"Search tutor by email"
,
"search_tutor_email"
:
"Search tutor by email"
,
...
...
sails/src/assets/app/i18n/es-es.json
View file @
304b2851
...
@@ -46,6 +46,7 @@
...
@@ -46,6 +46,7 @@
"birthdate"
:
"Fecha de nacimiento"
,
"birthdate"
:
"Fecha de nacimiento"
,
"black_and_white"
:
"ByN"
,
"black_and_white"
:
"ByN"
,
"cancel"
:
"Cancelar"
,
"cancel"
:
"Cancelar"
,
"cant_delete_active_scene"
:
"No se puede eliminar la escena activa, desactívela antes."
,
"cannot_delete_method"
:
"No se pudo eliminar el método, tal vez porque existen sesiones asociadas."
,
"cannot_delete_method"
:
"No se pudo eliminar el método, tal vez porque existen sesiones asociadas."
,
"cannot_delete_instruction"
:
"No se pudo eliminar la instrucción, tal vez porque existen sesiones asociadas."
,
"cannot_delete_instruction"
:
"No se pudo eliminar la instrucción, tal vez porque existen sesiones asociadas."
,
"case_requested"
:
"Por favor, especifique el tipo de usuario."
,
"case_requested"
:
"Por favor, especifique el tipo de usuario."
,
...
@@ -135,6 +136,8 @@
...
@@ -135,6 +136,8 @@
"error_on_update"
:
"Error al actualizar"
,
"error_on_update"
:
"Error al actualizar"
,
"error_on_upload"
:
"Error al subir la imagen. Compruebe que el archivo no supera 1MB de tamaño."
,
"error_on_upload"
:
"Error al subir la imagen. Compruebe que el archivo no supera 1MB de tamaño."
,
"error_loading_pictos"
:
"Error cargando información de los pictos"
,
"error_loading_pictos"
:
"Error cargando información de los pictos"
,
"error_loading_scene"
:
"Error cargando información de la escena"
,
"error_loading_scenes"
:
"Error cargando información de las escenas"
,
"error_general"
:
"Se ha producido un error"
,
"error_general"
:
"Se ha producido un error"
,
"error_rate"
:
"Tasa de error"
,
"error_rate"
:
"Tasa de error"
,
"February"
:
"Febrero"
,
"February"
:
"Febrero"
,
...
@@ -297,6 +300,7 @@
...
@@ -297,6 +300,7 @@
"record"
:
"Grabar"
,
"record"
:
"Grabar"
,
"register"
:
"Regístrate"
,
"register"
:
"Regístrate"
,
"register_button"
:
"Registrar"
,
"register_button"
:
"Registrar"
,
"reload_scene"
:
"Recargando escena"
,
"reloading_pictos"
:
"Recargando pictogramas"
,
"reloading_pictos"
:
"Recargando pictogramas"
,
"remember"
:
"No cerrar sesión"
,
"remember"
:
"No cerrar sesión"
,
"reports"
:
"Informes"
,
"reports"
:
"Informes"
,
...
@@ -305,6 +309,11 @@
...
@@ -305,6 +309,11 @@
"room_changed"
:
"Un participante abandonó la sesión. Sesión en pausa."
,
"room_changed"
:
"Un participante abandonó la sesión. Sesión en pausa."
,
"save"
:
"Guardar"
,
"save"
:
"Guardar"
,
"save_as_template"
:
"Guardar como plantilla"
,
"save_as_template"
:
"Guardar como plantilla"
,
"scene_already_deleted"
:
"La escena ya se había eliminado"
,
"scene_added"
:
"Escena creada correctamente"
,
"scene_deleted"
:
"Escena eliminada"
,
"scene_duplicated"
:
"Escena duplicada"
,
"scene_updated"
:
"Datos de la escena actualizados"
,
"search"
:
"Buscar"
,
"search"
:
"Buscar"
,
"search_sup_email"
:
"Buscar supervisor por email"
,
"search_sup_email"
:
"Buscar supervisor por email"
,
"search_tutor_email"
:
"Buscar tutor por email"
,
"search_tutor_email"
:
"Buscar tutor por email"
,
...
...
sails/src/assets/scripts/modules/student/controllers/collections.js
View file @
304b2851
...
@@ -261,14 +261,14 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
...
@@ -261,14 +261,14 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
});
});
};
};
//
Update
student scene
//
Create a new
student scene
$scope
.
new_scene
=
function
()
{
$scope
.
new_scene
=
function
()
{
$http
.
post
(
config
.
backend
+
'/scene/'
+
scene
.
id
+
'/stu/'
+
$scope
.
studentData
.
id
,
{
$http
.
post
(
config
.
backend
+
'/scene/'
+
scene
.
id
+
'/stu/'
+
$scope
.
studentData
.
id
,
{
name
:
$scope
.
newSceneName
,
name
:
$scope
.
newSceneName
,
id_sup
:
$scope
.
user
.
id
,
id_sup
:
$scope
.
user
.
id
,
categories
:
$scope
.
newSceneCat
})
categories
:
$scope
.
newSceneCat
})
.
success
(
function
()
{
.
success
(
function
(
scene
)
{
var
data
=
{
name
:
scene
.
name
,
var
data
=
{
name
:
scene
.
name
,
active
:
scene
.
active
,
active
:
scene
.
active
,
categories
:
scene
.
categories
,
categories
:
scene
.
categories
,
...
@@ -280,7 +280,7 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
...
@@ -280,7 +280,7 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
scene
:
data
scene
:
data
},
function
()
{});
},
function
()
{});
$translate
(
'scene_
updat
ed'
).
then
(
function
(
translation
)
{
$translate
(
'scene_
add
ed'
).
then
(
function
(
translation
)
{
ngToast
.
success
({
content
:
translation
});
ngToast
.
success
({
content
:
translation
});
});
});
...
@@ -295,7 +295,7 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
...
@@ -295,7 +295,7 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
name
:
scene
.
name
,
name
:
scene
.
name
,
active
:
scene
.
active
,
active
:
scene
.
active
,
id_stu
:
scene
.
student
})
id_stu
:
scene
.
student
})
.
success
(
function
()
{
.
success
(
function
(
scene
)
{
var
data
=
{
name
:
scene
.
name
,
var
data
=
{
name
:
scene
.
name
,
active
:
scene
.
active
,
active
:
scene
.
active
,
categories
:
scene
.
categories
,
categories
:
scene
.
categories
,
...
...
sails/src/assets/scripts/modules/student/views/setup.html
View file @
304b2851
...
@@ -166,18 +166,6 @@
...
@@ -166,18 +166,6 @@
<div
class=
"col-md-3"
>
<div
class=
"col-md-3"
>
<fieldset>
<fieldset>
<div
class=
"form-group"
>
<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>
<label
translate
>
picto_size
</label>
<div
class=
"input-group"
>
<div
class=
"input-group"
>
<span
class=
"input-group-addon"
>
<span
class=
"input-group-addon"
>
...
...
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