Summary boss shown on descriptor

modules/worker/back/models/worker.json

@@ -42,6 +42,11 @@
             "model": "Account",
             "foreignKey": "userFk"
         },
+        "boss": {
+            "type": "belongsTo",
+            "model": "Account",
+            "foreignKey": "bossFk"
+        },
         "client": {
             "type": "belongsTo",
             "model": "Client",
@@ -61,11 +66,6 @@
             "type": "hasMany",
             "model": "WorkerTeamCollegues",
             "foreignKey": "workerFk"
-        },
-        "boss": {
-            "type": "belongsTo",
-            "model": "Worker",
-            "foreignKey": "bossFk"
         }
     }
 }

modules/worker/front/summary/index.html

@@ -31,8 +31,12 @@
                 value="{{worker.department.department.name}}">
             </vn-label-value>
             <vn-label-value
-                label="Boss" 
+                label="Boss">
-                value="{{worker.boss.firstName}}">
+                <span
+                    ng-click="workerDescriptor.show($event, worker.boss.id)"
+                    class="link">
+                    {{::worker.boss.nickname}}
+                </span>
             </vn-label-value>
             <vn-label-value label="Phone" 
                 value="{{worker.phone}}">
@@ -54,4 +58,7 @@
             </vn-label-value>
         </vn-one>
     </vn-horizontal>
-</vn-card>
+</vn-card>
+<vn-worker-descriptor-popover 
+    vn-id="workerDescriptor">
+</vn-worker-descriptor-popover>

modules/worker/front/summary/index.js

@@ -11,8 +11,8 @@ class Controller extends Summary {
         this.$.worker = null;
         if (!value) return;
 
-        let query = `Workers/${value.id}`;
+        const query = `Workers/${value.id}`;
-        let filter = {
+        const filter = {
             include: [
                 {
                     relation: 'user',
@@ -31,16 +31,20 @@ class Controller extends Summary {
                             }
                         }]
                     }
-                }, {
+                },
+                {
                     relation: 'client',
                     scope: {fields: ['fi']}
-                }, {
+                },
+                {
                     relation: 'boss',
-                    scope: {fields: ['id', 'firstName']}
+                    scope: {fields: ['id', 'nickname']}
-                }, {
+                },
+                {
                     relation: 'sip',
                     scope: {fields: ['extension']}
-                }, {
+                },
+                {
                     relation: 'department',
                     scope: {
                         include: {