bx-rest 0.2.12 → 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)));
     }
@@ -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 }); }
@@ -3030,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 = {
@@ -3064,37 +3093,487 @@ class BXRestNavvyOperationElapseditem {
             return 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);
+        }));
+    }
+    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);
+    }
 }
 
-class BXRestMapTasksTask extends BaseMapServices {
-    getaccess(v) {
-        return (v && v.allowedActions) ? v.allowedActions : undefined;
+class BXRestNavvyElapseditem {
+    constructor(BXRestElapseditem, BXRestMapElapseditem, operation) {
+        this.BXRestElapseditem = BXRestElapseditem;
+        this.BXRestMapElapseditem = BXRestMapElapseditem;
+        this.operation = operation;
+        this.Navvy = new Navvy(this.BXRestElapseditem, this.BXRestMapElapseditem);
     }
-    add(item) {
-        return (item) ? this.TaskBXHttpToTaskBX(item.task) : undefined;
+    /*
+    call(methodName: string, ...args: any[]){
+      if (typeof this[methodName] === 'function') {
+        return this[methodName](...args);
+      }
+      return this[methodName](...args);
     }
-    get(item) {
-        return (item && item.task) ? this.TaskBXHttpToTaskBX(item.task) : undefined;
+     */
+    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);
     }
-    list(item) {
-        return (item && item.tasks) ? item.tasks.map(i => this.TaskBXHttpToTaskBX(i)) : undefined;
+    add(param) {
+        return this.operation.checkPermissionReadTask(param.TASKID).pipe(mergeMap(allowedReadTask => {
+            if (allowedReadTask) {
+                return this.operation.checkPermissionAddElapsedtimeToTask(param.TASKID).pipe(mergeMap(allowed => {
+                    if (allowed) {
+                        return this.BXRestElapseditem.add(param);
+                    }
+                    else {
+                        return throwError(() => new Error('Отсутствуют права добавление записи затраченного времени'));
+                    }
+                }));
+            }
+            else {
+                return throwError(() => new Error('Отсутствуют права на чтение задачи'));
+            }
+        }));
     }
-    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';
+    /**
+     * Обновление записи рабочего времени
+     *
+     * @param param
+     */
+    update(param) {
+        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) {
+                        return this.BXRestElapseditem.update(param);
+                    }
+                    else {
+                        return throwError(() => new Error('Отсутствуют права на изменение записи затраченного времени'));
+                    }
+                }));
+            }
+            else {
+                return throwError(() => new Error('Отсутствуют права на чтение задачи'));
+            }
+        })), 'Не удалось обновить элемент списка', this.BXRestMapElapseditem.update);
+    }
+    /*
+    getAll(
+      params: RequestParamsElapsedGetList | undefined = undefined,
+      cache = false
+    ): Observable<iHttpAnswerBX<BXRestElapsed[]> | undefined> {
+      return this.get(params, cache)
+        .pipe(
+          mergeMap(items => {
+            if (items && items.result) {
+              if (items.next) {
+                params = (params) ? params : {}
+                params.PARAMS = {
+                  NAV_PARAMS: {
+                    nPageSize: this.pageSize,
+                    iNumPage: items.next / this.pageSize + 1
+                  }
+                }
+                return this.getAll(params, cache).pipe(
+                  map(vEnd => {
+                    if (vEnd && vEnd.result && items.result) {
+                      return merge(clone(vEnd), {result: [...items.result, ...vEnd.result]})
+                    }
+                    return items
+                  })
+                )
+              }
+              return of(items)
+            } else {
+              return of(undefined)
+            }
+          })
+        )
+    }
+     */
+    /*
+    getCacheOff(params: RequestParamsElapsedGetList | undefined = undefined) {
+      return this.http.post<iHttpAnswerBX<BXRestElapsedHttp[]> | undefined>
+      (this.url.getlist, params, 'не удалось получить время по задачам')
+        .pipe(
+          map(v => {
+            if (v && v.result) {
+              const newResult: BXRestElapsed[] = []
+              for (let task of v.result) {
+                newResult.push(this.elapsedBXMap.AnswerElapsedGetHttpToAnswerElapsedGet(task))
+              }
+              return extend(v, {result: newResult}) as iHttpAnswerBX<BXRestElapsed[]>
+            }
+            return undefined
+          }),
+          tap(v => {
+            if (v && params) {
+              this.store.dispatch(saveHttpTaskTime({
+                filter: clone(params),
+                time: v
+              }))
+            }
+          })
+        )
+    }
+    */
+    isAllowedModify(idTask, idItem) {
+        let permission = Permission.get();
+        if (permission?.tasks?.length) {
+            let findTask = permission.tasks.find(i => i.id === idTask);
+            if (findTask) {
+                let find = findTask.elapsedItem.find(i => i.id === idItem);
+                if (find && find.verified.edit) {
+                    return of(find.edit);
+                }
+            }
+        }
+        return this.isActionAllowed({
+            TASKID: idTask,
+            ITEMID: 2,
+            ACTIONID: idItem
+        }).result().pipe(tap(v => {
+            if (v !== undefined) {
+                Permission.setTaskElapsedItem(idTask, {
+                    id: idItem,
+                    edit: v,
+                    del: false,
+                    verified: {
+                        edit: true,
+                        del: false,
+                    }
+                });
+            }
+        }));
+    }
+    isAllowedRemove(idTask, idItem) {
+        return this.isActionAllowed({
+            TASKID: idTask,
+            ITEMID: 3,
+            ACTIONID: idItem
+        }).result();
+    }
+    /**
+     * idAction:
+     * 1 - ACTION_ELAPSED_TIME_ADD
+     * 2 - ACTION_ELAPSED_TIME_MODIFY
+     * 3 - ACTION_ELAPSED_TIME_REMOVE
+     * @param param
+     */
+    isActionAllowed(param) {
+        return this.Navvy.simple(() => this.operation.checkPermissionReadTask(param.TASKID).pipe(mergeMap(canRead => {
+            if (canRead) {
+                return this.BXRestElapseditem.isActionAllowed(param);
+            }
+            return throwError(() => new Error('Отсутствуют права на чтение задачи'));
+        })));
+    }
+    del(param) {
+        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) {
+                        return this.BXRestElapseditem.del(param);
+                    }
+                    else {
+                        return throwError(() => new Error('Отсутствуют права на удаление записи затраченного времени'));
+                    }
+                }));
+            }
+            else {
+                return throwError(() => new Error('Отсутствуют права на чтение задачи'));
+            }
+        })), 'Не удалось удалить элемент списка', v => (v === null));
+    }
+    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: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: BXRestTaskElapseditem }, { type: BXRestMapTaskElapseditem }, { type: BXRestNavvyOperationElapseditem }]; } });
+
+class BXRestMapTaskCommentItem extends BaseMapServices {
+    getlist(value) {
+        return value ? value.map(i => this.iCommentTaskHtmlToiCommentTask(i)) : undefined;
+    }
+    get(value) {
+        return value ? this.iCommentTaskHtmlToiCommentTask(value) : undefined;
+    }
+    iCommentTaskHtmlToiCommentTask(item) {
+        if (item.ATTACHED_OBJECTS) {
+            return {
+                ATTACHED_OBJECTS: Object.values(item.ATTACHED_OBJECTS).map(i => {
+                    return {
+                        ATTACHMENT_ID: this.toNum(i.ATTACHMENT_ID),
+                        FILE_ID: this.toNum(i.FILE_ID),
+                        SIZE: this.toNum(i.SIZE),
+                        DOWNLOAD_URL: i.DOWNLOAD_URL,
+                        NAME: i.NAME,
+                        VIEW_URL: i.VIEW_URL
+                    };
+                }),
+                AUTHOR_ID: this.toNum(item.AUTHOR_ID),
+                ID: this.toNum(item.ID),
+                POST_DATE: this.toDate(item.POST_DATE),
+                AUTHOR_EMAIL: item.AUTHOR_EMAIL,
+                AUTHOR_NAME: item.AUTHOR_NAME,
+                POST_MESSAGE: item.POST_MESSAGE,
+                POST_MESSAGE_HTML: item.POST_MESSAGE_HTML
+            };
+        }
+        else {
+            return {
+                AUTHOR_ID: this.toNum(item.AUTHOR_ID),
+                ID: this.toNum(item.ID),
+                POST_DATE: this.toDate(item.POST_DATE),
+                AUTHOR_EMAIL: item.AUTHOR_EMAIL,
+                AUTHOR_NAME: item.AUTHOR_NAME,
+                POST_MESSAGE: item.POST_MESSAGE,
+                POST_MESSAGE_HTML: item.POST_MESSAGE_HTML
+            };
+        }
+    }
+    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);
@@ -3418,411 +3897,6 @@ 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);
-    }
-    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);
-    }
-    add(param) {
-        return this.checkPermissionReadTask(param.TASKID).pipe(mergeMap(allowedReadTask => {
-            if (allowedReadTask) {
-                return this.checkPermissionAddTask(param.TASKID).pipe(mergeMap(allowed => {
-                    if (allowed) {
-                        return this.BXRestElapseditem.add(param);
-                    }
-                    else {
-                        return throwError(() => new Error('Отсутствуют права добавление записи затраченного времени'));
-                    }
-                }));
-            }
-            else {
-                return throwError(() => new Error('Отсутствуют права на чтение задачи'));
-            }
-        }));
-    }
-    update(param) {
-        return this.Navvy.simple(() => this.checkPermissionReadTask(param.TASKID).pipe(mergeMap(allowedReadTask => {
-            if (allowedReadTask) {
-                return this.isAllowedModify(param.TASKID, param.ITEMID).pipe(mergeMap(allowed => {
-                    if (allowed) {
-                        return this.BXRestElapseditem.update(param);
-                    }
-                    else {
-                        return throwError(() => new Error('Отсутствуют права на изменение записи затраченного времени'));
-                    }
-                }));
-            }
-            else {
-                return throwError(() => new Error('Отсутствуют права на чтение задачи'));
-            }
-        })), 'Не удалось обновить элемент списка', this.BXRestMapElapseditem.update);
-    }
-    /*
-    getAll(
-      params: RequestParamsElapsedGetList | undefined = undefined,
-      cache = false
-    ): Observable<iHttpAnswerBX<BXRestElapsed[]> | undefined> {
-      return this.get(params, cache)
-        .pipe(
-          mergeMap(items => {
-            if (items && items.result) {
-              if (items.next) {
-                params = (params) ? params : {}
-                params.PARAMS = {
-                  NAV_PARAMS: {
-                    nPageSize: this.pageSize,
-                    iNumPage: items.next / this.pageSize + 1
-                  }
-                }
-                return this.getAll(params, cache).pipe(
-                  map(vEnd => {
-                    if (vEnd && vEnd.result && items.result) {
-                      return merge(clone(vEnd), {result: [...items.result, ...vEnd.result]})
-                    }
-                    return items
-                  })
-                )
-              }
-              return of(items)
-            } else {
-              return of(undefined)
-            }
-          })
-        )
-    }
-     */
-    /*
-    getCacheOff(params: RequestParamsElapsedGetList | undefined = undefined) {
-      return this.http.post<iHttpAnswerBX<BXRestElapsedHttp[]> | undefined>
-      (this.url.getlist, params, 'не удалось получить время по задачам')
-        .pipe(
-          map(v => {
-            if (v && v.result) {
-              const newResult: BXRestElapsed[] = []
-              for (let task of v.result) {
-                newResult.push(this.elapsedBXMap.AnswerElapsedGetHttpToAnswerElapsedGet(task))
-              }
-              return extend(v, {result: newResult}) as iHttpAnswerBX<BXRestElapsed[]>
-            }
-            return undefined
-          }),
-          tap(v => {
-            if (v && params) {
-              this.store.dispatch(saveHttpTaskTime({
-                filter: clone(params),
-                time: v
-              }))
-            }
-          })
-        )
-    }
-    */
-    isAllowedModify(idTask, idItem) {
-        let permission = Permission.get();
-        if (permission?.tasks?.length) {
-            let findTask = permission.tasks.find(i => i.id === idTask);
-            if (findTask) {
-                let find = findTask.elapsedItem.find(i => i.id === idItem);
-                if (find && find.verified.edit) {
-                    return of(find.edit);
-                }
-            }
-        }
-        return this.isActionAllowed({
-            TASKID: idTask,
-            ITEMID: 2,
-            ACTIONID: idItem
-        }).result().pipe(tap(v => {
-            if (v !== undefined) {
-                Permission.setTaskElapsedItem(idTask, {
-                    id: idItem,
-                    edit: v,
-                    del: false,
-                    verified: {
-                        edit: true,
-                        del: false,
-                    }
-                });
-            }
-        }));
-    }
-    isAllowedRemove(idTask, idItem) {
-        return this.isActionAllowed({
-            TASKID: idTask,
-            ITEMID: 3,
-            ACTIONID: idItem
-        }).result();
-    }
-    /**
-     * idAction:
-     * 1 - ACTION_ELAPSED_TIME_ADD
-     * 2 - ACTION_ELAPSED_TIME_MODIFY
-     * 3 - ACTION_ELAPSED_TIME_REMOVE
-     * @param param
-     */
-    isActionAllowed(param) {
-        return this.Navvy.simple(() => this.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 => {
-            if (allowedReadTask) {
-                return this.isAllowedRemove(param.TASKID, param.ITEMID).pipe(mergeMap(allowed => {
-                    if (allowed) {
-                        return this.BXRestElapseditem.del(param);
-                    }
-                    else {
-                        return throwError(() => new Error('Отсутствуют права на удаление записи затраченного времени'));
-                    }
-                }));
-            }
-            else {
-                return throwError(() => new Error('Отсутствуют права на чтение задачи'));
-            }
-        })), 'Не удалось удалить элемент списка', 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.ɵ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: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }], ctorParameters: function () { return [{ type: BXRestTaskElapseditem }, { type: BXRestNavvyUser }, { type: BXRestNavvyTasks }, { type: BXRestMapTaskElapseditem }, { type: HttpBXServices }]; } });
-
-class BXRestMapTaskCommentItem extends BaseMapServices {
-    getlist(value) {
-        return value ? value.map(i => this.iCommentTaskHtmlToiCommentTask(i)) : undefined;
-    }
-    get(value) {
-        return value ? this.iCommentTaskHtmlToiCommentTask(value) : undefined;
-    }
-    iCommentTaskHtmlToiCommentTask(item) {
-        if (item.ATTACHED_OBJECTS) {
-            return {
-                ATTACHED_OBJECTS: Object.values(item.ATTACHED_OBJECTS).map(i => {
-                    return {
-                        ATTACHMENT_ID: this.toNum(i.ATTACHMENT_ID),
-                        FILE_ID: this.toNum(i.FILE_ID),
-                        SIZE: this.toNum(i.SIZE),
-                        DOWNLOAD_URL: i.DOWNLOAD_URL,
-                        NAME: i.NAME,
-                        VIEW_URL: i.VIEW_URL
-                    };
-                }),
-                AUTHOR_ID: this.toNum(item.AUTHOR_ID),
-                ID: this.toNum(item.ID),
-                POST_DATE: this.toDate(item.POST_DATE),
-                AUTHOR_EMAIL: item.AUTHOR_EMAIL,
-                AUTHOR_NAME: item.AUTHOR_NAME,
-                POST_MESSAGE: item.POST_MESSAGE,
-                POST_MESSAGE_HTML: item.POST_MESSAGE_HTML
-            };
-        }
-        else {
-            return {
-                AUTHOR_ID: this.toNum(item.AUTHOR_ID),
-                ID: this.toNum(item.ID),
-                POST_DATE: this.toDate(item.POST_DATE),
-                AUTHOR_EMAIL: item.AUTHOR_EMAIL,
-                AUTHOR_NAME: item.AUTHOR_NAME,
-                POST_MESSAGE: item.POST_MESSAGE,
-                POST_MESSAGE_HTML: item.POST_MESSAGE_HTML
-            };
-        }
-    }
-    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 BXRestNavvyTask {
-    constructor(elapseditem, commentitem) {
-        this.elapseditem = elapseditem;
-        this.commentitem = commentitem;
-    }
-    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' }); }
-}
-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 }]; } });
-
 class BXRestMapDiskBase extends BaseMapServices {
     separationFoldersAndFiles(arr) {
         let result = { file: [], folder: [] };