diff --git a/front/salix/components/log/index.html b/front/salix/components/log/index.html index a51e07cb3..00ab23cc9 100644 --- a/front/salix/components/log/index.html +++ b/front/salix/components/log/index.html @@ -26,10 +26,9 @@ {{::log.user ? log.user.name.charAt(0).toUpperCase() : 'S'}} + ng-if="::log.user.image" + ng-src="/api/Images/user/160x160/{{::log.userFk}}/download?access_token={{::$ctrl.vnToken.token}}" + ng-click="$ctrl.showWorkerDescriptor($event, log)">
@@ -115,12 +114,6 @@
-
- Filter -
diff --git a/front/salix/components/log/index.js b/front/salix/components/log/index.js index b3a27ca5e..46c6cd0f4 100644 --- a/front/salix/components/log/index.js +++ b/front/salix/components/log/index.js @@ -23,7 +23,7 @@ export default class Controller extends Section { include: [{ relation: 'user', scope: { - fields: ['nickname', 'name'], + fields: ['nickname', 'name', 'image'], include: { relation: 'worker', scope: { @@ -120,11 +120,6 @@ export default class Controller extends Section { return this.dateFilter(date, `${format} HH:mm`); } - showWorkerDescriptor(event, workerId) { - if (!workerId) return; - this.$.workerDescriptor.show(event.target, workerId); - } - resetFilter() { this.$.filter = {who: 'all'}; } @@ -201,6 +196,11 @@ export default class Controller extends Section { backgroundColor: '#'+ colors[hash % colors.length] }; } + + showWorkerDescriptor(event, log) { + if (log.user?.worker) + this.$.workerDescriptor.show(event.target, log.userFk); + } } ngModule.vnComponent('vnLog', { diff --git a/front/salix/components/log/style.scss b/front/salix/components/log/style.scss index 4bf6ca1a2..ca0c9473c 100644 --- a/front/salix/components/log/style.scss +++ b/front/salix/components/log/style.scss @@ -32,7 +32,6 @@ vn-log { justify-content: center; } img { - display: none; cursor: pointer; position: absolute; top: 0;