diff --git a/front/salix/components/log/index.html b/front/salix/components/log/index.html index b1e5ace12..00ab23cc9 100644 --- a/front/salix/components/log/index.html +++ b/front/salix/components/log/index.html @@ -19,19 +19,17 @@
- - -
+
{{::log.user ? log.user.name.charAt(0).toUpperCase() : 'S'}}
+ +
@@ -116,12 +114,6 @@
-
- Filter -
diff --git a/front/salix/components/log/index.js b/front/salix/components/log/index.js index 19bf5b597..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'], + 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', { @@ -229,7 +229,7 @@ const colors = [ 'DC143C', // Red crimson '5681cf', // Blue steel 'FF1493', // Ping intense - '00d700', // Green lime + '02ba02', // Green lime '1E90FF', // Blue sky '8B008B', // Purple dark 'cc7000', // Orange bright diff --git a/front/salix/components/log/style.scss b/front/salix/components/log/style.scss index 34c432083..ca0c9473c 100644 --- a/front/salix/components/log/style.scss +++ b/front/salix/components/log/style.scss @@ -9,6 +9,7 @@ vn-log { padding-right: 10px; & > .user { + position: relative; border-radius: 50%; height: 36px; width: 36px; @@ -21,19 +22,20 @@ vn-log { width: 100%; height: 100%; } - img { - display: block; - cursor: pointer; + &.system { + background-color: $color-main; } - .user-icon { + .user-letter { font-size: 22px; display: flex; align-items: center; justify-content: center; - - &.system { - background-color: $color-main; - } + } + img { + cursor: pointer; + position: absolute; + top: 0; + left: 0; } } & > .arrow {