refs #5918 fix(worker_time-control): isMailSended

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

@@ -37,9 +37,8 @@ module.exports = Self => {
         }
     });
 
-    Self.updateWorkerTimeControlMail = async(ctx, options) => {
+    Self.updateWorkerTimeControlMail = async(ctx, workerId, year, week, state, reason, options) => {
         const models = Self.app.models;
-        const args = ctx.args;
 
         const myOptions = {};
 
@@ -48,20 +47,21 @@ module.exports = Self => {
 
         const workerTimeControlMail = await models.WorkerTimeControlMail.findOne({
             where: {
-                workerFk: args.workerId,
+                workerFk: workerId,
-                year: args.year,
+                year,
-                week: args.week
+                week
             }
         }, myOptions);
 
+        console.log('workerTimeControlMail: ', workerTimeControlMail);
         if (!workerTimeControlMail) throw new UserError(`There aren't records for this week`);
 
         await workerTimeControlMail.updateAttributes({
-            state: args.state,
+            state,
-            reason: args.reason || null
+            reason: reason || null
         }, myOptions);
 
-        if (args.state == 'SENDED') {
+        if (state == 'SENDED') {
             await workerTimeControlMail.updateAttributes({
                 sendedCounter: workerTimeControlMail.sendedCounter + 1
             }, myOptions);

modules/worker/front/time-control/index.js

@@ -143,21 +143,22 @@ class Controller extends Section {
     }
 
     isMailSended() {
-        const filterTimeControl = {
+        const filter = {
             where: {
                 year: this._date.getFullYear(),
                 week: this.getWeekNumber(this._date)
             },
             limit: 1
         };
-        this.$http.get('WorkerTimeControlMails', {filterTimeControl})
+        // no repeat request
+        this.$http.get('WorkerTimeControlMails', {filter})
             .then(res => {
                 if (!res.data.length) {
                     this.canResend = false;
                     return;
                 }
 
-                const filterDepartment = {
+                const filter = {
                     where: {
                         workerFk: this.$params.id
                     },
@@ -165,9 +166,9 @@ class Controller extends Section {
                         relation: 'department'
                     }
                 };
-                this.$http.get('WorkerDepartments', {filterDepartment})
+                this.$http.get('WorkerDepartments/findOne', {filter})
                     .then(res => {
-                        const department = res.data[0].department;
+                        const department = res.data.department;
                         if (department.isTeleworking) this.canResend = true;
                     });
             });