bx-rest 0.2.12 → 0.2.14

package/fesm2022/bx-rest.mjs

@@ -12,7 +12,7 @@ import { DateTime } from 'luxon';
 import * as i1$2 from '@angular/common/http';
 import { HttpParams, HttpHeaders } from '@angular/common/http';
 import flatten from 'just-flatten-it';
-import { map, catchError, mergeMap as mergeMap$1 } from 'rxjs/operators';
+import { map, catchError, take, mergeMap as mergeMap$1 } from 'rxjs/operators';
 
 const BX_REST_SETTINGS = {
     auth: {
@@ -1152,12 +1152,9 @@ class HttpBXServices extends HttpServices {
         }
         return res;
     }
-    // override mapBranchResult<T>(res: iBatchRequestAnswer<T>[]) {
-    //   return Object.assign([], ...res.map(i => (i.result && i.result.result) ? i.result.result : undefined)) as {
-    //     [key: keyBatch]: T
-    //   }
-    // }
-    //
+    mapBranchResult(res) {
+        return Object.assign([], ...res.map(i => (i.result && i.result.result) ? i.result.result : undefined));
+    }
     mapBranchResultWithoutKey(res) {
         return flatten(Object.assign([], ...res.map(i => (i.result && i.result.result) ? i.result.result : undefined)));
     }
@@ -1487,7 +1484,7 @@ class BXRestTaskPlanner {
     constructor(http) {
         this.http = http;
     }
-    getlist() {
+    getList() {
         return this.http.post([$task, $planner, $getlist]);
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestTaskPlanner, deps: [{ token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable }); }
@@ -1516,8 +1513,45 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImpor
                 }]
         }], ctorParameters: function () { return [{ type: BXRestTaskElapseditem }, { type: BXRestTaskCommentItem }, { type: BXRestTaskPlanner }]; } });
 
-class BXRestTasksTask {
+class BXRestTasksTaskResult {
     constructor(http) {
+        this.http = http;
+        this.url = {
+            list: [$tasks, $task, $result, $list],
+            addFromComment: [$tasks, $task, $result, 'addFromComment'],
+            deleteFromComment: [$tasks, $task, $result, 'deleteFromComment'], // Удаление результата задачи по комментарию из которого он был создан
+        };
+    }
+    deleteFromComment(commentID) {
+        return this.http.post(this.url.deleteFromComment, { commentId: commentID });
+    }
+    addFromComment(commentID) {
+        return this.http.post(this.url.addFromComment, { commentId: commentID });
+    }
+    list(param) {
+        return this.http.post(this.url.list, param);
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestTasksTaskResult, deps: [{ token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestTasksTaskResult, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestTasksTaskResult, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: HttpBXServices }]; } });
+
+// interface iBXRestParamTasksListWithSelect<S extends iBXRestTaskFieldsName> extends iBXRestParamTasksList<S> {
+//   select: iBXRestFilterGenerator<iBXRestTaskFieldsName>[]
+// }
+// interface iBXRestParamTasksGetWithSelect extends iBXRestParamTasksList {
+//   select: iBXRestFilterGenerator<iBXRestTaskFieldsName>[]
+// }
+// type SelectInterfaceListType<T> = T extends iBXRestParamTasksListWithSelect ? iBXRestTasksTaskListHttpDefault : iBXRestHttpTasksTaskList
+// type SelectInterfaceGetType<T> = T extends iBXRestParamTasksGetWithSelect ? iBXRestTasksTaskGetHttpDefault : iBXRestHttpTasksTaskGet
+class BXRestTasksTask {
+    constructor(result, http) {
+        this.result = result;
         this.http = http;
         this.url = {
             add: [$tasks, $task, $add],
@@ -1549,12 +1583,7 @@ class BXRestTasksTask {
             start: [$tasks, $task, $start],
             startwatch: [$tasks, $task, 'startwatch'],
             stopwatch: [$tasks, $task, 'stopwatch'],
-            update: [$tasks, $task, $update],
-            result: {
-                list: [$tasks, $task, $result, $list],
-                addFromComment: [$tasks, $task, $result, 'addFromComment'],
-                deleteFromComment: [$tasks, $task, $result, 'deleteFromComment'], // Удаление результата задачи по комментарию из которого он был создан
-            }
+            update: [$tasks, $task, $update], // Обновляет задачу
         };
     }
     add(param) {
@@ -1595,10 +1624,10 @@ class BXRestTasksTask {
       return of(undefined)
     }
     */
-    get(requestArray) {
-        return this.http.post(this.url.get, requestArray);
+    get(param) {
+        return this.http.post(this.url.get, param);
     }
-    list(param = {}) {
+    list(param) {
         return this.http.post(this.url.list, param);
     }
     /*
@@ -1690,37 +1719,11 @@ class BXRestTasksTask {
         })
       )
     }
-  
-    deleteResultFromComment(commentID: number) {
-      return this.http.post<iHttpAnswerBX<any>>(this.url.result.deleteFromComment, {commentId: commentID})
-    }
-  
-    addResultFromComment(commentID: number) {
-      return this.http.post<iHttpAnswerBX<iTaskResultHttp>>(this.url.result.addFromComment, {commentId: commentID})
-        .pipe(
-          map(v => {
-            if (v && v.result) {
-              this.taskResultMap.iTaskResultHttpToiTaskResult(v.result)
-            }
-            return undefined
-          }))
-    }
-  
-    getResulList(taskId: number): Observable<iTaskResult[] | undefined> {
-      return this.http.post<iHttpAnswerBX<iTaskResultHttp[]>>(this.url.result.list, {taskId: taskId})
-        .pipe(
-          map(v => {
-            if (v && v.result) {
-              return v.result.map(i => this.taskResultMap.iTaskResultHttpToiTaskResult(i))
-            }
-            return undefined
-          }))
-    }
      */
     getaccess(param) {
         return this.http.post(this.url.getaccess, param);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestTasksTask, deps: [{ token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestTasksTask, deps: [{ token: BXRestTasksTaskResult }, { token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestTasksTask, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestTasksTask, decorators: [{
@@ -1728,7 +1731,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImpor
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: HttpBXServices }]; } });
+        }], ctorParameters: function () { return [{ type: BXRestTasksTaskResult }, { type: HttpBXServices }]; } });
 
 class BXRestTasks {
     constructor(task) {
@@ -2098,7 +2101,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImpor
 class BXRestCalendar {
     // TODO: эту дичь расформировать потом по классам
     /*
-    url = {
+    protected url = {
       accessibility: {get: getNameMethod([$calendar, $accessibility, $get])}, // Возвращает занятость пользователей из списка.
       meeting: {
         params: {
@@ -2181,10 +2184,7 @@ class BXRestSonetGroup {
     //     }
     //   )
     // }
-    get(param = {
-        filter: {},
-        order: {}
-    }) {
+    get(param = {}) {
         return this.http.post(this.url.get, param);
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestSonetGroup, deps: [{ token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable }); }
@@ -3030,43 +3030,123 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImpor
                 }]
         }] });
 
-class BXRestNavvyOperationElapseditem {
-    constructor(http, BXRestNavvyElapseditem, BXRestMapElapseditem) {
-        this.http = http;
-        this.BXRestNavvyElapseditem = BXRestNavvyElapseditem;
+class BXRestMapTaskElapseditem extends BaseMapServices {
+    update(p) {
+        return (p == null);
+    }
+    getList(v) {
+        return (v) ? v.map(i => this.ElapsedItemHttpToElapsedItem(i)) : undefined;
+    }
+    ElapsedItemHttpToElapsedItem(item) {
+        return Object.assign(item, {
+            ID: this.toNum(item.ID),
+            MINUTES: this.toNum(item.MINUTES),
+            SECONDS: this.toNum(item.SECONDS),
+            TASK_ID: this.toNum(item.TASK_ID),
+            USER_ID: this.toNum(item.USER_ID),
+            SOURCE: this.toNum(item.SOURCE),
+            CREATED_DATE: this.toDate(item.CREATED_DATE),
+            DATE_START: this.toDate(item.DATE_START),
+            DATE_STOP: this.toDate(item.DATE_STOP),
+        });
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTaskElapseditem, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTaskElapseditem, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTaskElapseditem, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
+class BXRestNavvyDelegateElapseditem {
+    constructor(BXRestElapseditem, BXRestMapElapseditem) {
+        this.BXRestElapseditem = BXRestElapseditem;
         this.BXRestMapElapseditem = BXRestMapElapseditem;
+        this.Navvy = new Navvy(this.BXRestElapseditem, this.BXRestMapElapseditem);
     }
-    getByInterval(idsUsers, dateStart, dateEnd) {
-        const param = {
-            ORDER: {
-                ID: 'DESC'
-            },
-            FILTER: {
-                USER_ID: idsUsers,
-                '>=CREATED_DATE': dateStart.toLocaleString('ru-Ru'),
-                '<=CREATED_DATE': dateEnd.toLocaleString('ru-Ru'),
+    getList(param = {}) {
+        if (param) {
+            if (!param.TASKID && !param.SELECT) {
+                param.SELECT = ['*'];
             }
-        };
-        return this.BXRestNavvyElapseditem.getList(param);
-    }
-    getListByIDTask(ids) {
-        return this.http.branch(ids.map(i => {
-            return {
-                name: this.http.getNameMethod([$task, $elapseditem, $getlist]),
-                param: {
-                    TASKID: i
-                }
-            };
-        })).pipe(map(v => {
-            if (v && v.length) {
-                return this.http.mapBranchResultWithoutKey(v).map(i => this.BXRestMapElapseditem.getList(i)).filter((i) => i !== undefined).flat();
+            if (!param.TASKID && !param.PARAMS) {
+                param.PARAMS = {
+                    NAV_PARAMS: {
+                        nPageSize: 50,
+                        iNumPage: 1
+                    }
+                };
             }
-            return undefined;
-        }));
+        }
+        return this.Navvy.alterPagNav(this.BXRestElapseditem.getList, param, 'Не удалось получить список затраченного на задачу(-и) времени', this.BXRestMapElapseditem.getList);
     }
-}
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyDelegateElapseditem, deps: [{ token: BXRestTaskElapseditem }, { token: BXRestMapTaskElapseditem }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyDelegateElapseditem, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyDelegateElapseditem, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: BXRestTaskElapseditem }, { type: BXRestMapTaskElapseditem }]; } });
+
+// import { iTaskResult, iTaskResultHttp } from '@/lib/typification/bitrix/api/rest/task/result/result'
+class BXRestMapTasksTaskResult extends BaseMapServices {
+    list(item) {
+        return (item) ? item.map(i => this.iTaskResultHttpToiTaskResult(i)) : undefined;
+    }
+    addFromComment(item) {
+        return (item) ? this.iTaskResultHttpToiTaskResult(item) : undefined;
+    }
+    iTaskResultHttpToiTaskResult(item) {
+        return Object.assign(item, {
+            createdAt: this.toDate(item.createdAt),
+            updatedAt: this.toDate(item.updatedAt)
+        });
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTasksTaskResult, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTasksTaskResult, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTasksTaskResult, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
+class BXRestNavvyTasksTaskResult {
+    constructor(BXRestTasksTaskResult, BXRestMapTasksTaskResult) {
+        this.BXRestTasksTaskResult = BXRestTasksTaskResult;
+        this.BXRestMapTasksTaskResult = BXRestMapTasksTaskResult;
+        this.Navvy = new Navvy(this.BXRestTasksTaskResult, this.BXRestMapTasksTaskResult);
+    }
+    deleteFromComment(commentID) {
+        return this.Navvy.simpleWithArg(this.BXRestTasksTaskResult.deleteFromComment, commentID, 'Не удалось удалить комментарий');
+    }
+    addFromComment(commentID) {
+        return this.Navvy.simpleWithArg(this.BXRestTasksTaskResult.addFromComment, commentID, 'Не удалось добавить комментарий', this.BXRestMapTasksTaskResult.addFromComment);
+    }
+    list(param) {
+        return this.Navvy.PagNav(this.BXRestTasksTaskResult.list, param, 'Не удалось добавить комментарий', this.BXRestMapTasksTaskResult.list);
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyTasksTaskResult, deps: [{ token: BXRestTasksTaskResult }, { token: BXRestMapTasksTaskResult }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyTasksTaskResult, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyTasksTaskResult, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: BXRestTasksTaskResult }, { type: BXRestMapTasksTaskResult }]; } });
 
+/// type SelectInterfaceTypeTasksTaskList<T> = T extends iBXRestHttpTasksTaskList ? iBXRestTasksTaskList : iBXRestTasksTaskListDefault
 class BXRestMapTasksTask extends BaseMapServices {
+    constructor(result) {
+        super();
+        this.result = result;
+    }
     getaccess(v) {
         return (v && v.allowedActions) ? v.allowedActions : undefined;
     }
@@ -3077,6 +3157,7 @@ class BXRestMapTasksTask extends BaseMapServices {
         return (item && item.task) ? this.TaskBXHttpToTaskBX(item.task) : undefined;
     }
     list(item) {
+        // @ts-ignore
         return (item && item.tasks) ? item.tasks.map(i => this.TaskBXHttpToTaskBX(i)) : undefined;
     }
     TaskBXHttpToTaskBX(item) {
@@ -3180,7 +3261,7 @@ class BXRestMapTasksTask extends BaseMapServices {
         }
         return Object.assign(item, result);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTasksTask, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTasksTask, deps: [{ token: BXRestMapTasksTaskResult }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTasksTask, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTasksTask, decorators: [{
@@ -3188,17 +3269,18 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImpor
             args: [{
                     providedIn: 'root'
                 }]
-        }] });
+        }], ctorParameters: function () { return [{ type: BXRestMapTasksTaskResult }]; } });
 
 // export interface TimeProcess {
 //   total: number,
 //   next: number
 // }
 class BXRestNavvyTasksTask {
-    constructor(BXRestTasksTask, 
+    constructor(result, BXRestTasksTask, 
     // private snackBar: SnackBarService,
     //  private store: Store<{ tasks: IStoreTask }>,
     BXRestMapTasksTask) {
+        this.result = result;
         this.BXRestTasksTask = BXRestTasksTask;
         this.BXRestMapTasksTask = BXRestMapTasksTask;
         // pageSize = 50
@@ -3359,42 +3441,11 @@ class BXRestNavvyTasksTask {
           }
         })
       )
-    }
-  
-    deleteResultFromComment(commentID: number) {
-      return this.http.post<iHttpAnswerBX<any>>(this.url.result.deleteFromComment, {commentId: commentID})
-    }
-  
-    addResultFromComment(commentID: number) {
-      return this.http.post<iHttpAnswerBX<iTaskResultHttp>>(this.url.result.addFromComment, {commentId: commentID})
-        .pipe(
-          map(v => {
-            if (v && v.result) {
-              this.taskResultMap.iTaskResultHttpToiTaskResult(v.result)
-            }
-            return undefined
-          }))
-    }
-  
-    getResulList(taskId: number): Observable<iTaskResult[] | undefined> {
-      return this.http.post<iHttpAnswerBX<iTaskResultHttp[]>>(this.url.result.list, {taskId: taskId})
-        .pipe(
-          map(v => {
-            if (v && v.result) {
-              return v.result.map(i => this.taskResultMap.iTaskResultHttpToiTaskResult(i))
-            }
-            return undefined
-          }))
-    }
-  
-    getPlannerList() {
-      return this.http.post<iHttpAnswerBX<(string | number)[]>>(this.url.planner.getlist)
-    }
-     */
+    }   */
     getaccess(param) {
         return this.Navvy.simpleWithArg(this.BXRestTasksTask.getaccess, param, 'Не удалось получить права на указанных пользователей', this.BXRestMapTasksTask.getaccess);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyTasksTask, deps: [{ token: BXRestTasksTask }, { token: BXRestMapTasksTask }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyTasksTask, deps: [{ token: BXRestNavvyTasksTaskResult }, { token: BXRestTasksTask }, { token: BXRestMapTasksTask }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyTasksTask, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyTasksTask, decorators: [{
@@ -3402,7 +3453,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImpor
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: BXRestTasksTask }, { type: BXRestMapTasksTask }]; } });
+        }], ctorParameters: function () { return [{ type: BXRestNavvyTasksTaskResult }, { type: BXRestTasksTask }, { type: BXRestMapTasksTask }]; } });
 
 class BXRestNavvyTasks {
     constructor(task) {
@@ -3418,45 +3469,152 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImpor
                 }]
         }], ctorParameters: function () { return [{ type: BXRestNavvyTasksTask }]; } });
 
-class BXRestMapTaskElapseditem extends BaseMapServices {
-    update(p) {
-        return (p == null);
+class BXRestNavvyOperationElapseditem {
+    constructor(http, delegate, BXRestMapElapseditem, BXRestNavvyUser, BXRestNavvyTasks) {
+        this.http = http;
+        this.delegate = delegate;
+        this.BXRestMapElapseditem = BXRestMapElapseditem;
+        this.BXRestNavvyUser = BXRestNavvyUser;
+        this.BXRestNavvyTasks = BXRestNavvyTasks;
     }
-    getList(v) {
-        return (v) ? v.map(i => this.ElapsedItemHttpToElapsedItem(i)) : undefined;
+    getByInterval(idsUsers, dateStart, dateEnd) {
+        const param = {
+            ORDER: {
+                ID: 'DESC'
+            },
+            FILTER: {
+                USER_ID: idsUsers,
+                '>=CREATED_DATE': dateStart.toLocaleString('ru-Ru'),
+                '<=CREATED_DATE': dateEnd.toLocaleString('ru-Ru'),
+            }
+        };
+        return this.delegate.getList(param);
     }
-    ElapsedItemHttpToElapsedItem(item) {
-        return Object.assign(item, {
-            ID: this.toNum(item.ID),
-            MINUTES: this.toNum(item.MINUTES),
-            SECONDS: this.toNum(item.SECONDS),
-            TASK_ID: this.toNum(item.TASK_ID),
-            USER_ID: this.toNum(item.USER_ID),
-            SOURCE: this.toNum(item.SOURCE),
-            CREATED_DATE: this.toDate(item.CREATED_DATE),
-            DATE_START: this.toDate(item.DATE_START),
-            DATE_STOP: this.toDate(item.DATE_STOP),
-        });
+    getListByIDTask(ids) {
+        return this.http.branch(ids.map(i => {
+            return {
+                name: this.http.getNameMethod([$task, $elapseditem, $getlist]),
+                param: {
+                    TASKID: i
+                }
+            };
+        })).pipe(map(v => {
+            if (v && v.length) {
+                return this.http.mapBranchResultWithoutKey(v).map(i => this.BXRestMapElapseditem.getList(i)).filter((i) => i !== undefined).flat();
+            }
+            return undefined;
+        }));
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTaskElapseditem, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTaskElapseditem, providedIn: 'root' }); }
+    checkPermissionAddElapsedtimeToTaskArr(tasks) {
+        let request = Object.assign({}, ...tasks.map(i => {
+            return { [i]: this.checkPermissionAddElapsedtimeToTask(i) };
+        }));
+        return forkJoin(request)
+            .pipe(take(1), mergeMap(v => {
+            let forForeach = Object.entries(v).map(([key, value]) => {
+                return { id: Number(key), value: value };
+            });
+            if (forForeach.find(i => i.value === undefined) !== undefined) {
+                let forForeachHave = forForeach.filter(i => i.value !== undefined);
+                let forForeachNotHave = forForeach.filter(i => i.value === undefined); // тут получаем все id не сохраненных у нас прав
+                return this.http.branch(Object.assign({}, ...forForeachNotHave
+                    .map(i => i.id)
+                    .map(i => {
+                    return {
+                        [i]: {
+                            name: this.http.getNameMethod([$tasks, $task, $getaccess]),
+                            param: {
+                                TASKID: i,
+                                ITEMID: 1,
+                                ACTIONID: 1
+                            }
+                        }
+                    };
+                }))).pipe(map(v => {
+                    if (v && v.length) {
+                        const res = this.http.mapBranchResult(v);
+                        forForeachNotHave = Object.entries(res).map(([key, value]) => {
+                            return { id: Number(key), value: value };
+                        });
+                        return Object.assign(forForeachHave, forForeachNotHave);
+                    }
+                    return undefined;
+                }));
+            }
+            return of(forForeach);
+        }));
+    }
+    checkPermissionAddElapsedtimeToTask(idTask) {
+        let permission = Permission.get();
+        if (permission?.tasks?.length) {
+            let findTask = permission.tasks.find(i => i.id === idTask);
+            if (findTask?.permission) {
+                return of(findTask.permission['ELAPSEDTIME.ADD']);
+            }
+            return this.BXRestNavvyUser.current().result().pipe(mergeMap(self => {
+                if (self) {
+                    return this.BXRestNavvyTasks.task.getaccess({
+                        id: idTask,
+                        users: [self.ID]
+                    }).result().pipe(tap(v => {
+                        if (v && v[self.ID]) {
+                            Permission.set({
+                                tasks: [{ id: idTask, permission: v[self.ID], elapsedItem: [] }]
+                            });
+                        }
+                    }), map(v => {
+                        return (v && v[self.ID]) ? v[self.ID]['ELAPSEDTIME.ADD'] : false;
+                    }));
+                }
+                return of(undefined);
+            }));
+        }
+        return of(undefined);
+    }
+    checkPermissionReadTask(idTask) {
+        let permission = Permission.get();
+        if (permission?.tasks?.length) {
+            let findTask = permission.tasks.find(i => i.id === idTask);
+            if (findTask?.permission) {
+                return of(findTask.permission.ACCEPT);
+            }
+            return this.BXRestNavvyUser.current().result().pipe(mergeMap(self => {
+                if (self) {
+                    return this.BXRestNavvyTasks.task.getaccess({
+                        id: idTask,
+                        users: [self.ID]
+                    }).result().pipe(tap(v => {
+                        if (v && v[self.ID]) {
+                            Permission.set({
+                                tasks: [{ id: idTask, permission: v[self.ID], elapsedItem: [] }]
+                            });
+                        }
+                    }), map(v => {
+                        return (v && v[self.ID]) ? v[self.ID].ACCEPT : false;
+                    }));
+                }
+                return of(undefined);
+            }));
+        }
+        return of(undefined);
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyOperationElapseditem, deps: [{ token: HttpBXServices }, { token: BXRestNavvyDelegateElapseditem }, { token: BXRestMapTaskElapseditem }, { token: BXRestNavvyUser }, { token: BXRestNavvyTasks }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyOperationElapseditem, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTaskElapseditem, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyOperationElapseditem, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }] });
+        }], ctorParameters: function () { return [{ type: HttpBXServices }, { type: BXRestNavvyDelegateElapseditem }, { type: BXRestMapTaskElapseditem }, { type: BXRestNavvyUser }, { type: BXRestNavvyTasks }]; } });
 
 class BXRestNavvyElapseditem {
-    constructor(BXRestElapseditem, BXRestNavvyUser, BXRestNavvyTasks, BXRestMapElapseditem, http) {
+    constructor(BXRestElapseditem, BXRestMapElapseditem, delegate, operation) {
         this.BXRestElapseditem = BXRestElapseditem;
-        this.BXRestNavvyUser = BXRestNavvyUser;
-        this.BXRestNavvyTasks = BXRestNavvyTasks;
         this.BXRestMapElapseditem = BXRestMapElapseditem;
-        this.http = http;
+        this.delegate = delegate;
+        this.operation = operation;
         this.Navvy = new Navvy(this.BXRestElapseditem, this.BXRestMapElapseditem);
-        this.operation = new BXRestNavvyOperationElapseditem(this.http, this, this.BXRestMapElapseditem);
     }
     /*
     call(methodName: string, ...args: any[]){
@@ -3467,25 +3625,12 @@ class BXRestNavvyElapseditem {
     }
      */
     getList(param = {}) {
-        if (param) {
-            if (!param.TASKID && !param.SELECT) {
-                param.SELECT = ['*'];
-            }
-            if (!param.TASKID && !param.PARAMS) {
-                param.PARAMS = {
-                    NAV_PARAMS: {
-                        nPageSize: 50,
-                        iNumPage: 1
-                    }
-                };
-            }
-        }
-        return this.Navvy.alterPagNav(this.BXRestElapseditem.getList, param, 'Не удалось получить список затраченного на задачу(-и) времени', this.BXRestMapElapseditem.getList);
+        return this.delegate.getList(param);
     }
     add(param) {
-        return this.checkPermissionReadTask(param.TASKID).pipe(mergeMap(allowedReadTask => {
+        return this.operation.checkPermissionReadTask(param.TASKID).pipe(mergeMap(allowedReadTask => {
             if (allowedReadTask) {
-                return this.checkPermissionAddTask(param.TASKID).pipe(mergeMap(allowed => {
+                return this.operation.checkPermissionAddElapsedtimeToTask(param.TASKID).pipe(mergeMap(allowed => {
                     if (allowed) {
                         return this.BXRestElapseditem.add(param);
                     }
@@ -3499,8 +3644,13 @@ class BXRestNavvyElapseditem {
             }
         }));
     }
+    /**
+     * Обновление записи рабочего времени
+     *
+     * @param param
+     */
     update(param) {
-        return this.Navvy.simple(() => this.checkPermissionReadTask(param.TASKID).pipe(mergeMap(allowedReadTask => {
+        return this.Navvy.simple(() => this.operation.checkPermissionReadTask(param.TASKID).pipe(mergeMap(allowedReadTask => {
             if (allowedReadTask) {
                 return this.isAllowedModify(param.TASKID, param.ITEMID).pipe(mergeMap(allowed => {
                     if (allowed) {
@@ -3620,69 +3770,15 @@ class BXRestNavvyElapseditem {
      * @param param
      */
     isActionAllowed(param) {
-        return this.Navvy.simple(() => this.checkPermissionReadTask(param.TASKID).pipe(mergeMap(canRead => {
+        return this.Navvy.simple(() => this.operation.checkPermissionReadTask(param.TASKID).pipe(mergeMap(canRead => {
             if (canRead) {
                 return this.BXRestElapseditem.isActionAllowed(param);
             }
             return throwError(() => new Error('Отсутствуют права на чтение задачи'));
         })));
     }
-    checkPermissionAddTask(idTask) {
-        let permission = Permission.get();
-        if (permission?.tasks?.length) {
-            let findTask = permission.tasks.find(i => i.id === idTask);
-            if (findTask?.permission) {
-                return of(findTask.permission['ELAPSEDTIME.ADD']);
-            }
-            return this.BXRestNavvyUser.current().result().pipe(mergeMap(self => {
-                if (self) {
-                    return this.BXRestNavvyTasks.task.getaccess({
-                        id: idTask,
-                        users: [self.ID]
-                    }).result().pipe(tap(v => {
-                        if (v && v[self.ID]) {
-                            Permission.set({
-                                tasks: [{ id: idTask, permission: v[self.ID], elapsedItem: [] }]
-                            });
-                        }
-                    }), map(v => {
-                        return (v && v[self.ID]) ? v[self.ID]['ELAPSEDTIME.ADD'] : false;
-                    }));
-                }
-                return of(undefined);
-            }));
-        }
-        return of(undefined);
-    }
-    checkPermissionReadTask(idTask) {
-        let permission = Permission.get();
-        if (permission?.tasks?.length) {
-            let findTask = permission.tasks.find(i => i.id === idTask);
-            if (findTask?.permission) {
-                return of(findTask.permission.ACCEPT);
-            }
-            return this.BXRestNavvyUser.current().result().pipe(mergeMap(self => {
-                if (self) {
-                    return this.BXRestNavvyTasks.task.getaccess({
-                        id: idTask,
-                        users: [self.ID]
-                    }).result().pipe(tap(v => {
-                        if (v && v[self.ID]) {
-                            Permission.set({
-                                tasks: [{ id: idTask, permission: v[self.ID], elapsedItem: [] }]
-                            });
-                        }
-                    }), map(v => {
-                        return (v && v[self.ID]) ? v[self.ID].ACCEPT : false;
-                    }));
-                }
-                return of(undefined);
-            }));
-        }
-        return of(undefined);
-    }
     del(param) {
-        return this.Navvy.simple(() => this.checkPermissionReadTask(param.TASKID).pipe(mergeMap(allowedReadTask => {
+        return this.Navvy.simple(() => this.operation.checkPermissionReadTask(param.TASKID).pipe(mergeMap(allowedReadTask => {
             if (allowedReadTask) {
                 return this.isAllowedRemove(param.TASKID, param.ITEMID).pipe(mergeMap(allowed => {
                     if (allowed) {
@@ -3698,7 +3794,7 @@ class BXRestNavvyElapseditem {
             }
         })), 'Не удалось удалить элемент списка', v => (v === null));
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyElapseditem, deps: [{ token: BXRestTaskElapseditem }, { token: BXRestNavvyUser }, { token: BXRestNavvyTasks }, { token: BXRestMapTaskElapseditem }, { token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyElapseditem, deps: [{ token: BXRestTaskElapseditem }, { token: BXRestMapTaskElapseditem }, { token: BXRestNavvyDelegateElapseditem }, { token: BXRestNavvyOperationElapseditem }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyElapseditem, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyElapseditem, decorators: [{
@@ -3706,7 +3802,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImpor
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: BXRestTaskElapseditem }, { type: BXRestNavvyUser }, { type: BXRestNavvyTasks }, { type: BXRestMapTaskElapseditem }, { type: HttpBXServices }]; } });
+        }], ctorParameters: function () { return [{ type: BXRestTaskElapseditem }, { type: BXRestMapTaskElapseditem }, { type: BXRestNavvyDelegateElapseditem }, { type: BXRestNavvyOperationElapseditem }]; } });
 
 class BXRestMapTaskCommentItem extends BaseMapServices {
     getlist(value) {
@@ -3808,12 +3904,46 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImpor
                 }]
         }], ctorParameters: function () { return [{ type: BXRestTaskCommentItem }, { type: BXRestMapTaskCommentItem }, { type: SnackBarService }]; } });
 
+class BXRestMapTaskPlaner extends BaseMapServices {
+    getList(v) {
+        return (v) ? v.map(i => this.toNum(i)) : undefined;
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTaskPlaner, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTaskPlaner, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTaskPlaner, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
+class BXRestNavvyTaskPlanner {
+    constructor(BXRestTaskPlanner, BXRestMapTaskPlaner) {
+        this.BXRestTaskPlanner = BXRestTaskPlanner;
+        this.BXRestMapTaskPlaner = BXRestMapTaskPlaner;
+        this.Navvy = new Navvy(this.BXRestTaskPlanner, this.BXRestMapTaskPlaner);
+    }
+    getList() {
+        return this.Navvy.simple(this.BXRestTaskPlanner.getList, 'Не удалось получить текущий клан на день', this.BXRestMapTaskPlaner.getList);
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyTaskPlanner, deps: [{ token: BXRestTaskPlanner }, { token: BXRestMapTaskPlaner }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyTaskPlanner, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyTaskPlanner, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: BXRestTaskPlanner }, { type: BXRestMapTaskPlaner }]; } });
+
 class BXRestNavvyTask {
-    constructor(elapseditem, commentitem) {
+    constructor(elapseditem, commentitem, planner) {
         this.elapseditem = elapseditem;
         this.commentitem = commentitem;
+        this.planner = planner;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyTask, deps: [{ token: BXRestNavvyElapseditem }, { token: BXRestNavvyTaskCommentItem }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyTask, deps: [{ token: BXRestNavvyElapseditem }, { token: BXRestNavvyTaskCommentItem }, { token: BXRestNavvyTaskPlanner }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyTask, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyTask, decorators: [{
@@ -3821,7 +3951,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImpor
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: BXRestNavvyElapseditem }, { type: BXRestNavvyTaskCommentItem }]; } });
+        }], ctorParameters: function () { return [{ type: BXRestNavvyElapseditem }, { type: BXRestNavvyTaskCommentItem }, { type: BXRestNavvyTaskPlanner }]; } });
 
 class BXRestMapDiskBase extends BaseMapServices {
     separationFoldersAndFiles(arr) {
@@ -4554,10 +4684,7 @@ class BXRestNavvySonetGroup {
         this.mapSonetGroup = mapSonetGroup;
         this.Navvy = new Navvy(this.BXRestSonetGroup, this.mapSonetGroup);
     }
-    get(param = {
-        filter: {},
-        order: {}
-    }) {
+    get(param = {}) {
         return this.Navvy.simpleWithArg(this.BXRestSonetGroup.get, param, 'Не удалось получить рабочую группу', this.mapSonetGroup.get);
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvySonetGroup, deps: [{ token: BXRestSonetGroup }, { token: BXRestMapSonetGroup }], target: i0.ɵɵFactoryTarget.Injectable }); }
@@ -4831,17 +4958,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImpor
                 }]
         }], ctorParameters: function () { return [{ type: BXRestMapLogBlogPost }]; } });
 
-class BXRestMapTaskResult extends BaseMapServices {
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTaskResult, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTaskResult, providedIn: 'root' }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTaskResult, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }] });
-
 class BXRestMapTaskStage extends BaseMapServices {
     get(value) {
         return (value) ? value.map(i => Object.assign(i, {
@@ -4861,13 +4977,12 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImpor
         }] });
 
 class BXRestMapTask {
-    constructor(commentItem, elapsedItem, result, stages) {
+    constructor(commentItem, elapsedItem, stages) {
         this.commentItem = commentItem;
         this.elapsedItem = elapsedItem;
-        this.result = result;
         this.stages = stages;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTask, deps: [{ token: BXRestMapTaskCommentItem }, { token: BXRestMapTaskElapseditem }, { token: BXRestMapTaskResult }, { token: BXRestMapTaskStage }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTask, deps: [{ token: BXRestMapTaskCommentItem }, { token: BXRestMapTaskElapseditem }, { token: BXRestMapTaskStage }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTask, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTask, decorators: [{
@@ -4875,7 +4990,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImpor
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: BXRestMapTaskCommentItem }, { type: BXRestMapTaskElapseditem }, { type: BXRestMapTaskResult }, { type: BXRestMapTaskStage }]; } });
+        }], ctorParameters: function () { return [{ type: BXRestMapTaskCommentItem }, { type: BXRestMapTaskElapseditem }, { type: BXRestMapTaskStage }]; } });
 
 class BXRestMapTasks {
     constructor(task) {