refs #5334 descriptor wprkerFk clientFk

modules/worker/front/department/card/index.js

@@ -7,15 +7,16 @@ class Controller extends ModuleCard {
             fields: ['id', 'name', 'code', 'workerFk', 'isProduction', 'chatName',
                 'isTeleworking', 'notificationEmail', 'hasToRefill', 'hasToSendMail', 'hasToMistake', 'clientFk'],
             include: [
-                {
+                {relation: 'client',
-                    relation: 'client',
+                    scope: {
-                    scope: {fields: ['name']}
+                        fields: ['id', 'name']
-                },
+                    }},
                 {
                     relation: 'worker',
-                    scope: {fields: ['name']}
+                    scope: {
+                        fields: ['id', 'firstName', 'lastName']
+                    }
                 }
-
             ]
         };
 

modules/worker/front/department/descriptor/index.html

@@ -24,11 +24,11 @@
             </vn-label-value>
             <vn-label-value
                 label="Self-consumption customer"
-                value="{{$ctrl.department.clientFK}}">
+                value="{{$ctrl.department.client.name}}">
             </vn-label-value>
             <vn-label-value
                 label="Boss department"
-                value="{{$ctrl.department.workerFk}}">
+                value="{{$ctrl.department.worker.firstName}} {{$ctrl.department.worker.secondName}}">
             </vn-label-value>
         </div>
         </div>

modules/worker/front/department/descriptor/index.js

@@ -19,13 +19,15 @@ class Controller extends Descriptor {
             fields: ['id', 'name', 'code', 'workerFk', 'isProduction', 'chatName',
                 'isTeleworking', 'notificationEmail', 'hasToRefill', 'hasToSendMail', 'hasToMistake', 'clientFk'],
             include: [
-                {
+                {relation: 'client',
-                    relation: 'client',
+                    scope: {
-                    scope: {fields: ['name']}
+                        fields: ['id', 'name']
-                },
+                    }},
                 {
                     relation: 'worker',
-                    scope: {fields: ['name']}
+                    scope: {
+                        fields: ['id', 'firstName', 'lastName']
+                    }
                 }
             ]
         };

modules/worker/front/department/descriptor/index.spec.js

@@ -1,26 +0,0 @@
-import './index.js';
-
-describe('vnWorkerDescriptor', () => {
-    let controller;
-    let $httpBackend;
-
-    beforeEach(ngModule('worker'));
-
-    beforeEach(inject(($componentController, _$httpBackend_) => {
-        $httpBackend = _$httpBackend_;
-        controller = $componentController('vnWorkerDescriptor', {$element: null});
-    }));
-
-    describe('loadData()', () => {
-        it(`should perform a get query to store the worker data into the controller`, () => {
-            const id = 1;
-            const response = 'foo';
-
-            $httpBackend.expectRoute('GET', `Workers/${id}`).respond(response);
-            controller.id = id;
-            $httpBackend.flush();
-
-            expect(controller.worker).toEqual(response);
-        });
-    });
-});