bx-rest 0.2.11 → 0.2.13

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)));
     }
@@ -1483,12 +1480,30 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImpor
                 }]
         }], ctorParameters: function () { return [{ type: HttpBXServices }]; } });
 
+class BXRestTaskPlanner {
+    constructor(http) {
+        this.http = http;
+    }
+    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 }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestTaskPlanner, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestTaskPlanner, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: HttpBXServices }]; } });
+
 class BXRestTask {
-    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: BXRestTask, deps: [{ token: BXRestTaskElapseditem }, { token: BXRestTaskCommentItem }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestTask, deps: [{ token: BXRestTaskElapseditem }, { token: BXRestTaskCommentItem }, { token: BXRestTaskPlanner }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestTask, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestTask, decorators: [{
@@ -1496,7 +1511,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImpor
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: BXRestTaskElapseditem }, { type: BXRestTaskCommentItem }]; } });
+        }], ctorParameters: function () { return [{ type: BXRestTaskElapseditem }, { type: BXRestTaskCommentItem }, { type: BXRestTaskPlanner }]; } });
 
 class BXRestTasksTask {
     constructor(http) {
@@ -1536,9 +1551,6 @@ class BXRestTasksTask {
                 list: [$tasks, $task, $result, $list],
                 addFromComment: [$tasks, $task, $result, 'addFromComment'],
                 deleteFromComment: [$tasks, $task, $result, 'deleteFromComment'], // Удаление результата задачи по комментарию из которого он был создан
-            },
-            planner: {
-                getlist: [$task, $planner, $getlist], // Возвращает массив, содержащий идентификаторы задач в плане на день
             }
         };
     }
@@ -1701,10 +1713,6 @@ class BXRestTasksTask {
             return undefined
           }))
     }
-  
-    getPlannerList() {s
-      return this.http.post<iHttpAnswerBX<(string | number)[]>>(this.url.planner.getlist)
-    }
      */
     getaccess(param) {
         return this.http.post(this.url.getaccess, param);
@@ -3019,11 +3027,43 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImpor
                 }]
         }] });
 
+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 BXRestNavvyOperationElapseditem {
-    constructor(http, BXRestNavvyElapseditem, BXRestMapElapseditem) {
+    constructor(http, BXRestNavvyElapseditem, BXRestMapElapseditem, BXRestNavvyUser, BXRestNavvyTasks) {
         this.http = http;
         this.BXRestNavvyElapseditem = BXRestNavvyElapseditem;
         this.BXRestMapElapseditem = BXRestMapElapseditem;
+        this.BXRestNavvyUser = BXRestNavvyUser;
+        this.BXRestNavvyTasks = BXRestNavvyTasks;
     }
     getByInterval(idsUsers, dateStart, dateEnd) {
         const param = {
@@ -3053,428 +3093,136 @@ class BXRestNavvyOperationElapseditem {
             return undefined;
         }));
     }
-}
-
-class BXRestMapTasksTask extends BaseMapServices {
-    getaccess(v) {
-        return (v && v.allowedActions) ? v.allowedActions : undefined;
+    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);
+        }));
     }
-    add(item) {
-        return (item) ? this.TaskBXHttpToTaskBX(item.task) : undefined;
+    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);
     }
-    get(item) {
-        return (item && item.task) ? this.TaskBXHttpToTaskBX(item.task) : 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);
     }
-    list(item) {
-        return (item && item.tasks) ? item.tasks.map(i => this.TaskBXHttpToTaskBX(i)) : undefined;
+}
+
+class BXRestNavvyElapseditem {
+    constructor(BXRestElapseditem, BXRestMapElapseditem, operation) {
+        this.BXRestElapseditem = BXRestElapseditem;
+        this.BXRestMapElapseditem = BXRestMapElapseditem;
+        this.operation = operation;
+        this.Navvy = new Navvy(this.BXRestElapseditem, this.BXRestMapElapseditem);
     }
-    TaskBXHttpToTaskBX(item) {
-        let result = {};
-        if (item.id) {
-            result.id = this.toNum(item.id);
-        }
-        if (item.parentId) {
-            result.parentId = this.toNum(item.parentId);
-        }
-        if (item.priority) {
-            result.priority = this.toNum(item.priority);
-        }
-        if (item.status) {
-            result.status = this.toNum(item.status);
-        }
-        if (item.multitask) {
-            result.multitask = item.multitask === 'Y';
-        }
-        if (item.groupId) {
-            result.groupId = this.toNum(item.groupId);
-        }
-        if (item.stageId) {
-            result.stageId = this.toNum(item.stageId);
-        }
-        if (item.createdBy) {
-            result.createdBy = this.toNum(item.createdBy);
-        }
-        if (item.createdDate) {
-            result.createdDate = this.toDate(item.createdDate);
-        }
-        if (item.responsibleId) {
-            result.responsibleId = this.toNum(item.responsibleId);
-        }
-        if (item.changedBy) {
-            result.changedBy = this.toNum(item.changedBy);
-        }
-        if (item.changedDate) {
-            result.changedDate = this.toDate(item.changedDate);
-        }
-        if (item.statusChangedBy) {
-            result.statusChangedBy = this.toNum(item.statusChangedBy);
-        }
-        if (item.statusChangedDate) {
-            result.statusChangedDate = this.toDate(item.statusChangedDate);
-        }
-        if (item.closedBy) {
-            result.closedBy = this.toNum(item.closedBy);
-        }
-        if (item.closedDate) {
-            result.closedDate = this.toDate(item.closedDate);
-        }
-        if (item.dateStart) {
-            result.dateStart = this.toDate(item.dateStart);
-        }
-        if (item.deadline) {
-            result.deadline = this.toDate(item.deadline);
-        }
-        if (item.startDatePlan) {
-            result.startDatePlan = this.toDate(item.startDatePlan);
-        }
-        if (item.endDatePlan) {
-            result.endDatePlan = this.toDate(item.endDatePlan);
-        }
-        if (item.forumTopicId) {
-            result.forumTopicId = this.toNum(item.forumTopicId);
-        }
-        if (item.forumId) {
-            result.forumId = this.toNum(item.forumId);
-        }
-        if (item.viewedDate) {
-            result.viewedDate = this.toDate(item.viewedDate);
-        }
-        if (item.sorting) {
-            result.sorting = this.toNum(item.sorting);
-        }
-        if (item.durationPlan) {
-            result.durationPlan = this.toNum(item.durationPlan);
-        }
-        if (item.descriptionInBbcode) {
-            result.descriptionInBbcode = item.descriptionInBbcode === 'Y';
-        }
-        if (item.accomplices) {
-            result.accomplices = item.accomplices.map(i => this.toNum(i));
-        }
-        if (item.subStatus) {
-            result.subStatus = this.toNum(item.subStatus);
-        }
-        if (item.creator) {
-            result.creator = Object.assign(item.creator, { id: this.toNum(item.creator.id) });
-        }
-        if (item.responsible) {
-            result.responsible = Object.assign(item.responsible, { id: this.toNum(item.responsible.id) });
-        }
-        if (item.accomplicesData) {
-            result.accomplicesData =
-                Object.values(item.accomplicesData).map(i => Object.assign(i, { id: this.toNum(i.id) }));
-        }
-        if (item.allowTimeTracking) {
-            result.allowTimeTracking = item.allowTimeTracking === 'Y';
+    /*
+    call(methodName: string, ...args: any[]){
+      if (typeof this[methodName] === 'function') {
+        return this[methodName](...args);
+      }
+      return this[methodName](...args);
+    }
+     */
+    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 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.ɵ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: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }] });
-
-// export interface TimeProcess {
-//   total: number,
-//   next: number
-// }
-class BXRestNavvyTasksTask {
-    constructor(BXRestTasksTask, 
-    // private snackBar: SnackBarService,
-    //  private store: Store<{ tasks: IStoreTask }>,
-    BXRestMapTasksTask) {
-        this.BXRestTasksTask = BXRestTasksTask;
-        this.BXRestMapTasksTask = BXRestMapTasksTask;
-        // pageSize = 50
-        // nowLoad$ = new ReplaySubject<TimeProcess>(1)
-        this.def = {
-            select: ['ID', 'PARENT_ID', 'TITLE', 'DESCRIPTION', 'MARK', 'PRIORITY', 'STATUS', 'MULTITASK',
-                'GROUP_ID', 'STAGE_ID', 'CREATED_BY', 'CREATED_DATE', 'RESPONSIBLE_ID', 'ACCOMPLICES', 'AUDITORS',
-                'CHANGED_BY', 'CHANGED_DATE', 'STATUS_CHANGED_DATE', 'CLOSED_BY', 'CLOSED_DATE', 'DATE_START', 'VIEWED_DATE',
-                'DEADLINE', 'START_DATE_PLAN', 'END_DATE_PLAN', 'FORKED_BY_TEMPLATE_ID', 'TIME_ESTIMATE', 'TIME_SPENT_IN_LOGS',
-                'TAGS', 'ALLOW_TIME_TRACKING'
-            ]
-        };
-        this.Navvy = new Navvy(this.BXRestTasksTask, this.BXRestMapTasksTask);
-        //  this.storeTask$ = this.store.select('tasks')
-        //  this.nowLoad$.next({
-        //    total: 0,
-        //    next: 0
-        //  })
-    }
-    add(param) {
-        return this.Navvy.simpleWithArg(this.BXRestTasksTask.add, param, 'Не удалось добавить задачу', this.BXRestMapTasksTask.add);
-        // return this.http.post<{ task: TaskBXHttp }>(this.url.add, {fields: param}).pipe(
-        //   map(v => {
-        //       if (v && v.result && v.result.task) {
-        //         return Object.assign(
-        //           v,
-        //           {
-        //             result: this.taskBXMap.TaskBXHttpToTaskBX(v.result.task)
-        //           })
-        //       }
-        //       return undefined
-        //     }
-        //   ))
-    }
-    /*
-    update(taskId: number, updateFields: iBXRestTaskFieldsName[], task: iBXRestTask) {
-      let sendTask: Record<string, any> = {}
-      let taskTS: Record<string, any> = task
-      if (updateFields.length) {
-        for (let updateField of updateFields) {
-          if (taskTS[camelCase(updateField)]) {
-            sendTask[updateField] = taskTS[camelCase(updateField)]
-          }
-        }
-        if (Object.values(sendTask).length) {
-          return this.http.post(
-            this.url.update,
-            {taskId: taskId, fields: sendTask},
-            'error to update task')
-        } else {
-          this.snackBar.error('not valid send data task')
-          console.error('not valid send data task', sendTask, task)
-          return of(undefined)
-        }
-      }
-  
-      this.snackBar.warning('not have field for update')
-      return of(undefined)
-    }
-    */
-    get(param) {
-        if (!param.select) {
-            param.select = this.def.select;
-        }
-        return this.Navvy.simpleWithArg(this.BXRestTasksTask.get, param, 'Не удалось получить задачу', this.BXRestMapTasksTask.get);
-    }
-    list(param = {}) {
-        if (!param.select) {
-            param.select = this.def.select;
-        }
-        return this.Navvy.PagNavTasks(this.BXRestTasksTask.list, param, 'Не удалось получить список задач', this.BXRestMapTasksTask.list);
-    }
-    /*
-    listArray(requestArray: RequestApiTaskListBX = {}) {
-      return this.list(requestArray).pipe(
-        map(v => this.http.mapResult(v)),
-        map(v => (v && v.tasks) ? v.tasks : [])
-      )
-    }
-  
-    listAll(requestArray: RequestApiTaskListBX = {}, cache = false): Observable<TaskBX[]> {
-      if (!requestArray.select) {
-        requestArray.select = this.def.select
-        if (cache) {
-          return this.storeTask$.pipe(
-            take(1),
-            mergeMap(tasks => {
-              if (tasks && tasks.data.http.list && requestArray.filter && requestArray.filter.ID) {
-                const ids = (typeof requestArray.filter.ID === 'number') ? [requestArray.filter.ID] : requestArray.filter.ID
-                let filter = tasks.data.http.list.filter(i => (i.id) ? ids.includes(i.id) : false)
-                if (filter.length === ids.length) {
-                  return of(filter)
-                }
-              }
-              return this.getEndListArray(requestArray)
-            })
-          )
-        }
-        return this.getEndListArray(requestArray)
-      }
-      return this.getEndListArray(requestArray)
-    }
-  
-    getEndListArray(requestArray: RequestApiTaskListBX): Observable<TaskBX[]> {
-      return this.list(requestArray).pipe(
-        mergeMap((items: AnswerApiTaskBX | undefined): ObservableInput<any> | Observable<AnswerApiTaskBX[]> => {
-          if (items && items.result && typeof items.result.tasks === 'object') {
-            const items$ = of(items.result.tasks)
-            if (items.next) {
-              this.nowLoad$.next({
-                total: (items.total) ? items.total : 0,
-                next: items.next
-              })
-              requestArray.start = items.next
-              return this.getEndListArray(requestArray).pipe(
-                map(vEnd => {
-                  if (vEnd && items.result.tasks) {
-                    return [...items.result.tasks, ...vEnd]
-                  }
-                  return (items.result.tasks) ? items.result.tasks : []
-                }))
-            }
-            this.nowLoad$.next({
-              total: 0,
-              next: 0
-            })
-            return items$
-          } else {
-            return of([])
-          }
-        })
-      )
-    }
-  
-    getFields() {
-      return this.storeTask$.pipe(
-        mergeMap(v => {
-          if (v && !v.data.fields) {
-            return this.http.post<iHttpAnswerBX<{ fields: iGetFieldsDescription }>>(this.url.getFields).pipe(
-              tap(v => {
-                if (v && v.result) {
-                  this.store.dispatch(saveFields(v.result))
-                }
-              }),
-              map(v => {
-                if (v && v.result && v.result.fields) {
-                  return {result: v.result.fields}
-                }
-  
-                return undefined
-              })
-            )
-          }
-          if (v.data.fields) {
-            return of({result: clone<iGetFieldsDescription>(v.data.fields)})
-          } else {
-            return of(undefined)
-          }
-        })
-      )
-    }
-  
-    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.ɵ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: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }], ctorParameters: function () { return [{ type: BXRestTasksTask }, { type: BXRestMapTasksTask }]; } });
-
-class BXRestNavvyTasks {
-    constructor(task) {
-        this.task = task;
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyTasks, deps: [{ token: BXRestNavvyTasksTask }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyTasks, providedIn: 'root' }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyTasks, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }], ctorParameters: function () { return [{ type: BXRestNavvyTasksTask }]; } });
-
-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 BXRestNavvyElapseditem {
-    constructor(BXRestElapseditem, BXRestNavvyUser, BXRestNavvyTasks, BXRestMapElapseditem, http) {
-        this.BXRestElapseditem = BXRestElapseditem;
-        this.BXRestNavvyUser = BXRestNavvyUser;
-        this.BXRestNavvyTasks = BXRestNavvyTasks;
-        this.BXRestMapElapseditem = BXRestMapElapseditem;
-        this.http = http;
-        this.Navvy = new Navvy(this.BXRestElapseditem, this.BXRestMapElapseditem);
-        this.operation = new BXRestNavvyOperationElapseditem(this.http, this, this.BXRestMapElapseditem);
-    }
-    /*
-    call(methodName: string, ...args: any[]){
-      if (typeof this[methodName] === 'function') {
-        return this[methodName](...args);
-      }
-      return this[methodName](...args);
-    }
-     */
-    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.Navvy.alterPagNav(this.BXRestElapseditem.getList, param, 'Не удалось получить список затраченного на задачу(-и) времени', this.BXRestMapElapseditem.getList);
     }
     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);
                     }
@@ -3488,8 +3236,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) {
@@ -3609,69 +3362,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) {
@@ -3687,7 +3386,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: 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: [{
@@ -3695,7 +3394,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: BXRestNavvyOperationElapseditem }]; } });
 
 class BXRestMapTaskCommentItem extends BaseMapServices {
     getlist(value) {
@@ -3738,79 +3437,465 @@ class BXRestMapTaskCommentItem extends BaseMapServices {
             };
         }
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTaskCommentItem, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTaskCommentItem, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTaskCommentItem, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTaskCommentItem, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTaskCommentItem, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
+class BXRestNavvyTaskCommentItem {
+    constructor(BXRestTaskCommentItem, mapTaskCommentItem, snackBar) {
+        this.BXRestTaskCommentItem = BXRestTaskCommentItem;
+        this.mapTaskCommentItem = mapTaskCommentItem;
+        this.snackBar = snackBar;
+        this.Navvy = new Navvy(this.BXRestTaskCommentItem, this.mapTaskCommentItem);
+    }
+    add(param) {
+        return this.Navvy.simpleWithArg(this.BXRestTaskCommentItem.add, param, 'Не удалось добавить комментарий к задаче');
+    }
+    update(param) {
+        return this.Navvy.simpleWithArg(this.BXRestTaskCommentItem.update, param, 'Не удалось обновить комментарий к задаче');
+    }
+    get(param) {
+        return this.Navvy.simpleWithArg(this.BXRestTaskCommentItem.get, param, 'Не удалось получить комментарий к задаче', this.mapTaskCommentItem.get);
+    }
+    getlist(param = {
+        FILTER: {},
+        ORDER: {
+            POST_DATE: 'asc'
+        }
+    }) {
+        return this.Navvy.simpleWithArg(this.BXRestTaskCommentItem.getlist, param, 'Не удалось получить комментарии к задаче', this.mapTaskCommentItem.getlist);
+    }
+    del(param) {
+        if (param.ITEMID > 0) {
+            return this.get(param).result().pipe(mergeMap(v => {
+                if (v) {
+                    return this.Navvy.simpleWithArg(this.BXRestTaskCommentItem.del, param, 'Не удалось удалить комментарий').result();
+                }
+                this.snackBar.warning('comment not exist');
+                return of(false);
+            }));
+        }
+        else {
+            this.snackBar.warning('comment not exist');
+            return of(false);
+        }
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyTaskCommentItem, deps: [{ token: BXRestTaskCommentItem }, { token: BXRestMapTaskCommentItem }, { token: SnackBarService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyTaskCommentItem, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyTaskCommentItem, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], 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, 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 }, { 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: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: BXRestNavvyElapseditem }, { type: BXRestNavvyTaskCommentItem }, { type: BXRestNavvyTaskPlanner }]; } });
+
+class BXRestMapTasksTask extends BaseMapServices {
+    getaccess(v) {
+        return (v && v.allowedActions) ? v.allowedActions : undefined;
+    }
+    add(item) {
+        return (item) ? this.TaskBXHttpToTaskBX(item.task) : undefined;
+    }
+    get(item) {
+        return (item && item.task) ? this.TaskBXHttpToTaskBX(item.task) : undefined;
+    }
+    list(item) {
+        return (item && item.tasks) ? item.tasks.map(i => this.TaskBXHttpToTaskBX(i)) : undefined;
+    }
+    TaskBXHttpToTaskBX(item) {
+        let result = {};
+        if (item.id) {
+            result.id = this.toNum(item.id);
+        }
+        if (item.parentId) {
+            result.parentId = this.toNum(item.parentId);
+        }
+        if (item.priority) {
+            result.priority = this.toNum(item.priority);
+        }
+        if (item.status) {
+            result.status = this.toNum(item.status);
+        }
+        if (item.multitask) {
+            result.multitask = item.multitask === 'Y';
+        }
+        if (item.groupId) {
+            result.groupId = this.toNum(item.groupId);
+        }
+        if (item.stageId) {
+            result.stageId = this.toNum(item.stageId);
+        }
+        if (item.createdBy) {
+            result.createdBy = this.toNum(item.createdBy);
+        }
+        if (item.createdDate) {
+            result.createdDate = this.toDate(item.createdDate);
+        }
+        if (item.responsibleId) {
+            result.responsibleId = this.toNum(item.responsibleId);
+        }
+        if (item.changedBy) {
+            result.changedBy = this.toNum(item.changedBy);
+        }
+        if (item.changedDate) {
+            result.changedDate = this.toDate(item.changedDate);
+        }
+        if (item.statusChangedBy) {
+            result.statusChangedBy = this.toNum(item.statusChangedBy);
+        }
+        if (item.statusChangedDate) {
+            result.statusChangedDate = this.toDate(item.statusChangedDate);
+        }
+        if (item.closedBy) {
+            result.closedBy = this.toNum(item.closedBy);
+        }
+        if (item.closedDate) {
+            result.closedDate = this.toDate(item.closedDate);
+        }
+        if (item.dateStart) {
+            result.dateStart = this.toDate(item.dateStart);
+        }
+        if (item.deadline) {
+            result.deadline = this.toDate(item.deadline);
+        }
+        if (item.startDatePlan) {
+            result.startDatePlan = this.toDate(item.startDatePlan);
+        }
+        if (item.endDatePlan) {
+            result.endDatePlan = this.toDate(item.endDatePlan);
+        }
+        if (item.forumTopicId) {
+            result.forumTopicId = this.toNum(item.forumTopicId);
+        }
+        if (item.forumId) {
+            result.forumId = this.toNum(item.forumId);
+        }
+        if (item.viewedDate) {
+            result.viewedDate = this.toDate(item.viewedDate);
+        }
+        if (item.sorting) {
+            result.sorting = this.toNum(item.sorting);
+        }
+        if (item.durationPlan) {
+            result.durationPlan = this.toNum(item.durationPlan);
+        }
+        if (item.descriptionInBbcode) {
+            result.descriptionInBbcode = item.descriptionInBbcode === 'Y';
+        }
+        if (item.accomplices) {
+            result.accomplices = item.accomplices.map(i => this.toNum(i));
+        }
+        if (item.subStatus) {
+            result.subStatus = this.toNum(item.subStatus);
+        }
+        if (item.creator) {
+            result.creator = Object.assign(item.creator, { id: this.toNum(item.creator.id) });
+        }
+        if (item.responsible) {
+            result.responsible = Object.assign(item.responsible, { id: this.toNum(item.responsible.id) });
+        }
+        if (item.accomplicesData) {
+            result.accomplicesData =
+                Object.values(item.accomplicesData).map(i => Object.assign(i, { id: this.toNum(i.id) }));
+        }
+        if (item.allowTimeTracking) {
+            result.allowTimeTracking = item.allowTimeTracking === 'Y';
+        }
+        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.ɵ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: BXRestMapTaskCommentItem, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTasksTask, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
         }] });
 
-class BXRestNavvyTaskCommentItem {
-    constructor(BXRestTaskCommentItem, mapTaskCommentItem, snackBar) {
-        this.BXRestTaskCommentItem = BXRestTaskCommentItem;
-        this.mapTaskCommentItem = mapTaskCommentItem;
-        this.snackBar = snackBar;
-        this.Navvy = new Navvy(this.BXRestTaskCommentItem, this.mapTaskCommentItem);
+// export interface TimeProcess {
+//   total: number,
+//   next: number
+// }
+class BXRestNavvyTasksTask {
+    constructor(BXRestTasksTask, 
+    // private snackBar: SnackBarService,
+    //  private store: Store<{ tasks: IStoreTask }>,
+    BXRestMapTasksTask) {
+        this.BXRestTasksTask = BXRestTasksTask;
+        this.BXRestMapTasksTask = BXRestMapTasksTask;
+        // pageSize = 50
+        // nowLoad$ = new ReplaySubject<TimeProcess>(1)
+        this.def = {
+            select: ['ID', 'PARENT_ID', 'TITLE', 'DESCRIPTION', 'MARK', 'PRIORITY', 'STATUS', 'MULTITASK',
+                'GROUP_ID', 'STAGE_ID', 'CREATED_BY', 'CREATED_DATE', 'RESPONSIBLE_ID', 'ACCOMPLICES', 'AUDITORS',
+                'CHANGED_BY', 'CHANGED_DATE', 'STATUS_CHANGED_DATE', 'CLOSED_BY', 'CLOSED_DATE', 'DATE_START', 'VIEWED_DATE',
+                'DEADLINE', 'START_DATE_PLAN', 'END_DATE_PLAN', 'FORKED_BY_TEMPLATE_ID', 'TIME_ESTIMATE', 'TIME_SPENT_IN_LOGS',
+                'TAGS', 'ALLOW_TIME_TRACKING'
+            ]
+        };
+        this.Navvy = new Navvy(this.BXRestTasksTask, this.BXRestMapTasksTask);
+        //  this.storeTask$ = this.store.select('tasks')
+        //  this.nowLoad$.next({
+        //    total: 0,
+        //    next: 0
+        //  })
     }
     add(param) {
-        return this.Navvy.simpleWithArg(this.BXRestTaskCommentItem.add, param, 'Не удалось добавить комментарий к задаче');
+        return this.Navvy.simpleWithArg(this.BXRestTasksTask.add, param, 'Не удалось добавить задачу', this.BXRestMapTasksTask.add);
+        // return this.http.post<{ task: TaskBXHttp }>(this.url.add, {fields: param}).pipe(
+        //   map(v => {
+        //       if (v && v.result && v.result.task) {
+        //         return Object.assign(
+        //           v,
+        //           {
+        //             result: this.taskBXMap.TaskBXHttpToTaskBX(v.result.task)
+        //           })
+        //       }
+        //       return undefined
+        //     }
+        //   ))
     }
-    update(param) {
-        return this.Navvy.simpleWithArg(this.BXRestTaskCommentItem.update, param, 'Не удалось обновить комментарий к задаче');
+    /*
+    update(taskId: number, updateFields: iBXRestTaskFieldsName[], task: iBXRestTask) {
+      let sendTask: Record<string, any> = {}
+      let taskTS: Record<string, any> = task
+      if (updateFields.length) {
+        for (let updateField of updateFields) {
+          if (taskTS[camelCase(updateField)]) {
+            sendTask[updateField] = taskTS[camelCase(updateField)]
+          }
+        }
+        if (Object.values(sendTask).length) {
+          return this.http.post(
+            this.url.update,
+            {taskId: taskId, fields: sendTask},
+            'error to update task')
+        } else {
+          this.snackBar.error('not valid send data task')
+          console.error('not valid send data task', sendTask, task)
+          return of(undefined)
+        }
+      }
+  
+      this.snackBar.warning('not have field for update')
+      return of(undefined)
     }
+    */
     get(param) {
-        return this.Navvy.simpleWithArg(this.BXRestTaskCommentItem.get, param, 'Не удалось получить комментарий к задаче', this.mapTaskCommentItem.get);
+        if (!param.select) {
+            param.select = this.def.select;
+        }
+        return this.Navvy.simpleWithArg(this.BXRestTasksTask.get, param, 'Не удалось получить задачу', this.BXRestMapTasksTask.get);
     }
-    getlist(param = {
-        FILTER: {},
-        ORDER: {
-            POST_DATE: 'asc'
+    list(param = {}) {
+        if (!param.select) {
+            param.select = this.def.select;
         }
-    }) {
-        return this.Navvy.simpleWithArg(this.BXRestTaskCommentItem.getlist, param, 'Не удалось получить комментарии к задаче', this.mapTaskCommentItem.getlist);
+        return this.Navvy.PagNavTasks(this.BXRestTasksTask.list, param, 'Не удалось получить список задач', this.BXRestMapTasksTask.list);
     }
-    del(param) {
-        if (param.ITEMID > 0) {
-            return this.get(param).result().pipe(mergeMap(v => {
-                if (v) {
-                    return this.Navvy.simpleWithArg(this.BXRestTaskCommentItem.del, param, 'Не удалось удалить комментарий').result();
+    /*
+    listArray(requestArray: RequestApiTaskListBX = {}) {
+      return this.list(requestArray).pipe(
+        map(v => this.http.mapResult(v)),
+        map(v => (v && v.tasks) ? v.tasks : [])
+      )
+    }
+  
+    listAll(requestArray: RequestApiTaskListBX = {}, cache = false): Observable<TaskBX[]> {
+      if (!requestArray.select) {
+        requestArray.select = this.def.select
+        if (cache) {
+          return this.storeTask$.pipe(
+            take(1),
+            mergeMap(tasks => {
+              if (tasks && tasks.data.http.list && requestArray.filter && requestArray.filter.ID) {
+                const ids = (typeof requestArray.filter.ID === 'number') ? [requestArray.filter.ID] : requestArray.filter.ID
+                let filter = tasks.data.http.list.filter(i => (i.id) ? ids.includes(i.id) : false)
+                if (filter.length === ids.length) {
+                  return of(filter)
                 }
-                this.snackBar.warning('comment not exist');
-                return of(false);
-            }));
-        }
-        else {
-            this.snackBar.warning('comment not exist');
-            return of(false);
+              }
+              return this.getEndListArray(requestArray)
+            })
+          )
         }
+        return this.getEndListArray(requestArray)
+      }
+      return this.getEndListArray(requestArray)
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyTaskCommentItem, deps: [{ token: BXRestTaskCommentItem }, { token: BXRestMapTaskCommentItem }, { token: SnackBarService }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyTaskCommentItem, providedIn: 'root' }); }
+  
+    getEndListArray(requestArray: RequestApiTaskListBX): Observable<TaskBX[]> {
+      return this.list(requestArray).pipe(
+        mergeMap((items: AnswerApiTaskBX | undefined): ObservableInput<any> | Observable<AnswerApiTaskBX[]> => {
+          if (items && items.result && typeof items.result.tasks === 'object') {
+            const items$ = of(items.result.tasks)
+            if (items.next) {
+              this.nowLoad$.next({
+                total: (items.total) ? items.total : 0,
+                next: items.next
+              })
+              requestArray.start = items.next
+              return this.getEndListArray(requestArray).pipe(
+                map(vEnd => {
+                  if (vEnd && items.result.tasks) {
+                    return [...items.result.tasks, ...vEnd]
+                  }
+                  return (items.result.tasks) ? items.result.tasks : []
+                }))
+            }
+            this.nowLoad$.next({
+              total: 0,
+              next: 0
+            })
+            return items$
+          } else {
+            return of([])
+          }
+        })
+      )
+    }
+  
+    getFields() {
+      return this.storeTask$.pipe(
+        mergeMap(v => {
+          if (v && !v.data.fields) {
+            return this.http.post<iHttpAnswerBX<{ fields: iGetFieldsDescription }>>(this.url.getFields).pipe(
+              tap(v => {
+                if (v && v.result) {
+                  this.store.dispatch(saveFields(v.result))
+                }
+              }),
+              map(v => {
+                if (v && v.result && v.result.fields) {
+                  return {result: v.result.fields}
+                }
+  
+                return undefined
+              })
+            )
+          }
+          if (v.data.fields) {
+            return of({result: clone<iGetFieldsDescription>(v.data.fields)})
+          } else {
+            return of(undefined)
+          }
+        })
+      )
+    }
+  
+    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.ɵ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: BXRestNavvyTaskCommentItem, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyTasksTask, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: BXRestTaskCommentItem }, { type: BXRestMapTaskCommentItem }, { type: SnackBarService }]; } });
+        }], ctorParameters: function () { return [{ type: BXRestTasksTask }, { type: BXRestMapTasksTask }]; } });
 
-class BXRestNavvyTask {
-    constructor(elapseditem, commentitem) {
-        this.elapseditem = elapseditem;
-        this.commentitem = commentitem;
+class BXRestNavvyTasks {
+    constructor(task) {
+        this.task = task;
     }
-    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.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyTask, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyTasks, deps: [{ token: BXRestNavvyTasksTask }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyTasks, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyTask, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyTasks, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: BXRestNavvyElapseditem }, { type: BXRestNavvyTaskCommentItem }]; } });
+        }], ctorParameters: function () { return [{ type: BXRestNavvyTasksTask }]; } });
 
 class BXRestMapDiskBase extends BaseMapServices {
     separationFoldersAndFiles(arr) {