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
915cf83f
authored
Jun 05, 2017
by
Arturo Montejo Ráez
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
fixed issue
#258
parent
8b8869a6
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
4 deletions
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/app/i18n/en-gb.json
View file @
915cf83f
...
...
@@ -238,6 +238,7 @@
"next_actions"
:
"Next actions"
,
"next_sessions"
:
"Next sessions"
,
"no"
:
"No"
,
"no_categories"
:
"Without categories"
,
"nobegin"
:
"No started"
,
"no_method"
:
"No method defined"
,
"no_office"
:
"No office"
,
...
...
@@ -455,6 +456,7 @@
"warning_no_pictos_found"
:
"No pictograms found with specified keyword"
,
"warning_no_tablet_online"
:
"No Pictogran Tablet online detected"
,
"warning_two_characters"
:
"Must type at least two characters"
,
"with_categories"
:
"With categories"
,
"woman"
:
"Woman"
,
"year_totals"
:
"Year totals"
,
"yes"
:
"Yes"
,
...
...
sails/src/assets/app/i18n/es-es.json
View file @
915cf83f
...
...
@@ -238,6 +238,7 @@
"next_actions"
:
"Acciones posteriores"
,
"next_sessions"
:
"Sesiones posteriores"
,
"no"
:
"No"
,
"no_categories"
:
"Sin categorías"
,
"no_method"
:
"Método sin definir"
,
"no_office"
:
"Sin centro"
,
"no_instruction"
:
"Instrucción sin definir"
,
...
...
@@ -455,6 +456,7 @@
"warning_no_pictos_found"
:
"No se encontraron pictogramas con las palabras introducidas"
,
"warning_no_tablet_online"
:
"No se detectó ningún usuario de Pictogram Tablet online"
,
"warning_two_characters"
:
"Debe introducir al menos dos caracteres"
,
"with_categories"
:
"Con categorías"
,
"woman"
:
"Mujer"
,
"year_totals"
:
"Totales año"
,
"yes"
:
"Sí"
,
...
...
sails/src/assets/scripts/modules/student/controllers/collections.js
View file @
915cf83f
...
...
@@ -132,7 +132,8 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
$http
.
get
(
config
.
backend
+
'/stu/'
+
$scope
.
studentData
.
id
+
'/activeScene'
)
.
success
(
function
(
activeScene
)
{
$scope
.
showFreeCategory
=
!
activeScene
.
categories
;
$scope
.
showFreeCategory
=
!
activeScene
.
categories
;
activeScene
.
name
=
$translate
.
instant
(
activeScene
.
name
);
$scope
.
viewingScene
=
activeScene
;
activeScene
.
pictos
.
forEach
(
placePicto
);
$scope
.
loadingPictos
=
false
;
...
...
@@ -156,8 +157,10 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
$http
.
get
(
config
.
backend
+
'/scene/'
+
idScene
)
.
success
(
function
(
scene
)
{
$scope
.
showFreeCategory
=
!
scene
.
categories
;
$scope
.
viewingScene
=
scene
;
$scope
.
showFreeCategory
=
!
scene
.
categories
;
scene
.
name
=
$translate
.
instant
(
scene
.
name
);
$scope
.
viewingScene
=
scene
;
scene
.
pictos
.
forEach
(
placePicto
);
$scope
.
loadingPictos
=
false
;
//setTimeout(function () { $scope.$apply(); });
...
...
@@ -173,7 +176,8 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
$scope
.
loadScenesList
=
function
()
{
$http
.
get
(
config
.
backend
+
'/stu/'
+
$scope
.
studentData
.
id
+
'/scenes'
)
.
success
(
function
(
scenes
)
{
.
success
(
function
(
scenes
)
{
scenes
.
map
((
sce
)
=>
{
sce
.
name
=
$translate
.
instant
(
sce
.
name
);
return
sce
});
$scope
.
scenesList
=
scenes
;
//setTimeout(function () { $scope.$apply(); });
})
...
...
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