Commit 5f9e03f7 by Pablo Molina

Corregido el problema de carga de pictos en el dashboard

parent 3be72fc6
......@@ -121,6 +121,7 @@
"licenses_left": "{{number}} licenses left",
"light_up": "Light up",
"link": "Link",
"loading_pictos": "Loading pictos",
"login": "Log In",
"login_fail": "Invalid user or password",
"login_success": "Login succeed. Welcome {{name}}",
......
......@@ -121,6 +121,7 @@
"licenses_left": "{{number}} licencias disponibles",
"light_up": "Iluminar",
"link": "Vincular",
"loading_pictos": "Cargando pictos",
"login": "Iniciar sesión",
"login_fail": "Usuario o contraseña incorrectos",
"login_success": "Login correcto. Bienvenido {{name}}",
......
......@@ -47,6 +47,7 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
$scope.studentPictos = {};
$scope.freeCategoryPictos = null;
$scope.categories = [];
$scope.loadingPictos = true;
$scope.isCategory = function (studentPicto) {
return studentPicto.attributes.id_cat === null &&
......@@ -82,6 +83,7 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
$http.get(config.backend + '/stu/' + $scope.studentData.id + '/pictos')
.success(function (studentPictos) {
$scope.categories = [];
$scope.showFreeCategory = !$scope.studentData.attributes.categories;
studentPictos.forEach(function (studentPicto) {
var positionX = studentPicto.attributes.coord_x;
var positionY = studentPicto.attributes.coord_y;
......@@ -106,6 +108,9 @@ dashboardControllers.controller('StudentCollectionsCtrl', function StudentCollec
$scope.studentPictos[category][positionX][positionY] = studentPicto;
}
});
$scope.loadingPictos = false;
setTimeout(function () { $scope.$apply(); });
})
.error(function () {});
};
......
......@@ -3,14 +3,18 @@
<div class="panel-body">
<div class="row">
<!-- Fin de columna vistas por categorías -->
<div class="col-md-12">
<div class="col-md-6">
<a class="btn btn-success btn-sm" role="button" ng-click="open()">
<i class="glyphicon glyphicon-plus" aria-hidden="true"></i>
<span translate>add_picto</span>
</a>
</div>
</div>
<div id="student_collection">
<div
id="student_collection"
class="student-collection"
ng-class="{ 'student-collection-loading': loadingPictos }"
data-loading="{{ 'loading_pictos' | translate }}">
<div
ng-if="showFreeCategory"
class="picto-grid picto-free-grid">
......
@import 'variables.less';
@keyframes slightFadeIn {
from { opacity: 0; }
to { opacity: 0.25; }
}
/**
* Show "loading" while pictos haven't load
*/
.student-collection {
position: relative;
&-loading:before {
content: attr(data-loading);
display: block;
position: absolute;
top: 50%;
left: 50%;
transform: translateX(-50%) translateY(-50%);
font-size: 7.5vmin;
z-index: 1;
opacity: 0;
font-weight: lighter;
animation:
slightFadeIn linear
(@animationDuration * 2)
infinite alternate;
}
}
/**
* Main group of pictos (a "main" row with all the categories to be shown)
*/
......
@dividerColor: #ddd;
@spacingUnit: 1em;
@roundness: 4px;
@animationDuration: 0.3s;
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