Merge branch 'dev' into 5316-kkeoEntryNotes

front/salix/components/log/index.html

@@ -19,19 +19,17 @@
         <div class="user-wrapper">
             <div
                 class="user vn-mt-xs"
-                title="{{::log.user.nickname || 'System'}}">
-                <img
-                    ng-if="::log.user.worker"
-                    src="/api/Images/user/160x160/{{::log.user.worker.id}}/download?access_token={{::$ctrl.vnToken.token}}"
-                    ng-click="$ctrl.showWorkerDescriptor($event, log.user.worker.id)">
-                </img>
-                <div
-                    ng-if="::!log.user.worker"
                 ng-class="::{system: !log.user}"
                 ng-style="::$ctrl.userBgColor(log.user)"
-                    class="user-icon">
+                title="{{::log.user.nickname || 'System'}}">
+                <div class="user-letter">
                     {{::log.user ? log.user.name.charAt(0).toUpperCase() : 'S'}}
                 </div>
+                <img
+                    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)">
+                </img>
             </div>
             <div class="arrow bg-panel"></div>
             <div class="line"></div>
@@ -116,12 +114,6 @@
     <form vn-vertical
         ng-model-options="{updateOn: 'change blur'}"
         class="vn-pa-md filter">
-        <h6
-            class="text-secondary vn-mb-md"
-            style="font-weight: normal;"
-            translate>
-            Filter
-        </h6>
         <vn-textfield
             label="Name"
             ng-model="filter.changedModelValue">

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

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 {
+                &.system {
-                    display: block;
+                    background-color: $color-main;
-                    cursor: pointer;
                 }
-                .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 {