Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2692-add_advanced_search_engine2

front/salix/components/summary/index.js

@@ -2,7 +2,13 @@ import ngModule from '../../module';
 import Section from '../section';
 import './style.scss';
 
-export default class Summary extends Section {}
+export default class Summary extends Section {
+    listEmails(email) {
+        if (!email) return;
+        const emailList = email.split(',');
+        return emailList.join(', ');
+    }
+}
 
 ngModule.vnComponent('vnSummary', {
     controller: Summary

front/salix/components/summary/index.spec.js

@@ -0,0 +1,30 @@
+import './index.js';
+
+describe('Salix', () => {
+    describe('Component vnSummary', () => {
+        let controller;
+
+        beforeEach(ngModule('salix'));
+
+        beforeEach(inject($componentController => {
+            const $element = angular.element('<vn-summary></vn-summary>');
+            controller = $componentController('vnSummary', {$element});
+        }));
+
+        describe('listEmails()', () => {
+            it('should do nothing when receives no arguments', () => {
+                const emailList = controller.listEmails();
+
+                expect(emailList).toBeUndefined();
+            });
+
+            it('should format the receives emails to be separated with comma', () => {
+                const expectedResult = 'captainmarvel@marvel.com, ironman@marvel.com';
+
+                const emailList = controller.listEmails('captainmarvel@marvel.com,ironman@marvel.com');
+
+                expect(emailList).toEqual(expectedResult);
+            });
+        });
+    });
+});

modules/client/front/summary/index.html

@@ -40,7 +40,7 @@
                 value="{{$ctrl.summary.mobile}}">
             </vn-label-value>
             <vn-label-value label="Email" no-ellipsize
-                value="{{$ctrl.summary.email}}">
+                value="{{$ctrl.listEmails($ctrl.summary.email)}}">
             </vn-label-value>
             <vn-label-value label="Sales person">
                 <span 

modules/worker/back/methods/worker-time-control/deleteTimeEntry.js

@@ -26,11 +26,11 @@ module.exports = Self => {
         const workerModel = Self.app.models.Worker;
 
         const targetTimeEntry = await Self.findById(id);
-
         const isSubordinate = await workerModel.isSubordinate(ctx, targetTimeEntry.userFk);
-        const isHHRR = await Self.app.models.Account.hasRole(currentUserId, 'hr');
+        const isTeamBoss = await Self.app.models.Account.hasRole(currentUserId, 'teamBoss');
+        const isHimself = currentUserId == targetTimeEntry.userFk;
 
-        const notAllowed = isSubordinate === false || (isSubordinate && currentUserId == targetTimeEntry.userFk && !isHHRR);
+        const notAllowed = isSubordinate === false || (isSubordinate && isHimself && !isTeamBoss);
 
         if (notAllowed)
             throw new UserError(`You don't have enough privileges`);

modules/worker/back/methods/worker-time-control/specs/timeEntry.spec.js

@@ -5,6 +5,8 @@ describe('workerTimeControl add/delete timeEntry()', () => {
     const HHRRId = 37;
     const teamBossId = 13;
     const employeeId = 1;
+    const salesPersonId = 106;
+    const salesBossId = 19;
     let activeCtx = {
         accessToken: {userId: 50},
     };
@@ -85,13 +87,13 @@ describe('workerTimeControl add/delete timeEntry()', () => {
     });
 
     it('should try but fail to delete his own time entry', async() => {
-        activeCtx.accessToken.userId = teamBossId;
+        activeCtx.accessToken.userId = salesBossId;
         let error;
         let todayAtSeven = new Date();
         todayAtSeven.setHours(19, 30, 0, 0);
 
         let data = {
-            workerFk: teamBossId,
+            workerFk: salesPersonId,
             timed: todayAtSeven
         };
 
@@ -100,6 +102,7 @@ describe('workerTimeControl add/delete timeEntry()', () => {
         createdTimeEntry = await app.models.WorkerTimeControl.findById(timeEntry.id);
 
         try {
+            activeCtx.accessToken.userId = salesPersonId;
             await app.models.WorkerTimeControl.deleteTimeEntry(ctx, createdTimeEntry.id);
         } catch (e) {
             error = e;
@@ -110,6 +113,30 @@ describe('workerTimeControl add/delete timeEntry()', () => {
         expect(error.message).toBe(`You don't have enough privileges`);
     });
 
+    it('should delete the created time entry for the team boss as himself', async() => {
+        activeCtx.accessToken.userId = teamBossId;
+
+        let todayAtFive = new Date();
+        todayAtFive.setHours(17, 30, 0, 0);
+
+        let data = {
+            workerFk: teamBossId,
+            timed: todayAtFive
+        };
+
+        timeEntry = await app.models.WorkerTimeControl.addTimeEntry(ctx, data);
+
+        createdTimeEntry = await app.models.WorkerTimeControl.findById(timeEntry.id);
+
+        expect(createdTimeEntry).toBeDefined();
+
+        await app.models.WorkerTimeControl.deleteTimeEntry(ctx, createdTimeEntry.id);
+
+        createdTimeEntry = await app.models.WorkerTimeControl.findById(timeEntry.id);
+
+        expect(createdTimeEntry).toBeNull();
+    });
+
     it('should delete the created time entry for the team boss as HHRR', async() => {
         activeCtx.accessToken.userId = HHRRId;