bx-rest 0.2.1 → 0.2.3

package/fesm2022/bx-rest.mjs

@@ -1,6 +1,6 @@
 import * as i0 from '@angular/core';
 import { NgModule, inject, Component, ViewEncapsulation, Inject, Injectable } from '@angular/core';
-import { Subscription, of, mergeMap, throwError, forkJoin, share, from, concatMap, last, concat, tap, shareReplay } from 'rxjs';
+import { Subscription, of, mergeMap, throwError, forkJoin, share, ReplaySubject, last, shareReplay, concat, from, concatMap, tap } from 'rxjs';
 import { map, catchError, mergeMap as mergeMap$1 } from 'rxjs/operators';
 import clone from 'just-clone';
 import * as i1$1 from '@angular/material/snack-bar';
@@ -1224,108 +1224,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImpor
                 }]
         }] });
 
-class BaseMapServices extends BaseServices {
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BaseMapServices, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BaseMapServices, providedIn: 'root' }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BaseMapServices, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }] });
-
-class BXRestUserMap extends BaseMapServices {
-    get(v) {
-        return (v) ? v.map(i => this.userHttpToTrace(i)) : undefined;
-    }
-    current(v) {
-        return this.userHttpToTrace(v);
-    }
-    userHttpToTrace(user) {
-        let res = Object.assign(clone(user), {
-            ID: this.toNum(user.ID),
-            IS_ONLINE: this.toBool(user.IS_ONLINE),
-            DATE_REGISTER: this.toDate(user.DATE_REGISTER),
-            PERSONAL_BIRTHDAY: this.toDate(user.PERSONAL_BIRTHDAY),
-        });
-        if (user.LAST_LOGIN) {
-            res.LAST_LOGIN = this.toDate(user.LAST_LOGIN);
-        }
-        return res;
-    }
-    BXtoHttp(user) {
-        return Object.assign(clone(user), {
-            ID: this.toStr(user.ID),
-            IS_ONLINE: this.toBXYorN(user.IS_ONLINE),
-            DATE_REGISTER: this.getBXStrTime(user.DATE_REGISTER),
-            PERSONAL_BIRTHDAY: this.toStr(user.PERSONAL_BIRTHDAY),
-            LAST_LOGIN: this.toStr(user.LAST_LOGIN)
-        });
-    }
-    getFIO(user) {
-        let res = '';
-        if (!user.LAST_NAME) {
-            const SECOND_NAME = (user.SECOND_NAME) ? user.SECOND_NAME : '';
-            const NAME = (user.NAME) ? user.NAME : '';
-            res = NAME + ' ' + SECOND_NAME;
-        }
-        else if (!user.NAME) {
-            res = user.LAST_NAME;
-        }
-        else if (!user.SECOND_NAME) {
-            res = user.LAST_NAME + ' ' + user.NAME;
-        }
-        else {
-            res = user.LAST_NAME + ' ' + user.NAME + ' ' + user.SECOND_NAME;
-        }
-        return res.trim();
-    }
-    getFI(user) {
-        let res = '';
-        if (!user.LAST_NAME) {
-            const NAME = (user.NAME) ? user.NAME : '';
-            res = NAME;
-        }
-        else if (!user.NAME) {
-            res = user.LAST_NAME;
-        }
-        else {
-            res = user.LAST_NAME + ' ' + user.NAME;
-        }
-        return res.trim();
-    }
-    getFIOShort(user) {
-        let res = '';
-        if (!user.LAST_NAME) {
-            const SECOND_NAME = (user.SECOND_NAME) ? user.SECOND_NAME : '';
-            const NAME = (user.NAME) ? user.NAME : '';
-            res = NAME + ' ' + SECOND_NAME;
-        }
-        else if (!user.NAME) {
-            res = user.LAST_NAME;
-        }
-        else if (!user.SECOND_NAME) {
-            res = user.LAST_NAME + ' ' + user.NAME.charAt(0).toUpperCase() + '.';
-        }
-        else {
-            res =
-                user.LAST_NAME + ' ' +
-                    user.NAME.charAt(0).toUpperCase() + '.' +
-                    user.SECOND_NAME.charAt(0).toUpperCase() + '.';
-        }
-        return res.trim();
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestUserMap, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestUserMap, providedIn: 'root' }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestUserMap, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }] });
-
 class BXRestUserUserfield {
     constructor(http) {
         this.http = http;
@@ -1347,9 +1245,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImpor
         }], ctorParameters: function () { return [{ type: HttpBXServices }]; } });
 
 class BXRestUser {
-    constructor(http, BXRestUserMap, userfield) {
+    constructor(http, userfield) {
         this.http = http;
-        this.BXRestUserMap = BXRestUserMap;
         this.userfield = userfield;
         this.url = {
             admin: [$user, 'admin'],
@@ -1379,25 +1276,8 @@ class BXRestUser {
             return request.pipe(share());
         }
     }
-    update(user, fieldUpdate) {
-        if (fieldUpdate && fieldUpdate.length) {
-            let sendData = {
-                ID: user.ID,
-            };
-            const userBX = this.BXRestUserMap.BXtoHttp(user);
-            for (const field of fieldUpdate) {
-                if (userBX[field]) {
-                    sendData[field] = userBX[field];
-                }
-                else {
-                    return throwError(() => 'One sent field is empty');
-                }
-            }
-            return this.http.post(this.url.update, sendData);
-        }
-        else {
-            return throwError(() => 'All sent field for edit is empty');
-        }
+    update(user) {
+        return this.http.post(this.url.update, user);
     }
     search(params) {
         return this.http.get(this.url.search, params);
@@ -1408,7 +1288,7 @@ class BXRestUser {
     fields() {
         return this.http.get(this.url.fields);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestUser, deps: [{ token: HttpBXServices }, { token: BXRestUserMap }, { token: BXRestUserUserfield }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestUser, deps: [{ token: HttpBXServices }, { token: BXRestUserUserfield }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestUser, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestUser, decorators: [{
@@ -1416,7 +1296,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImpor
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: HttpBXServices }, { type: BXRestUserMap }, { type: BXRestUserUserfield }]; } });
+        }], ctorParameters: function () { return [{ type: HttpBXServices }, { type: BXRestUserUserfield }]; } });
 
 class BXRestListsField {
     constructor(http) {
@@ -1510,7 +1390,7 @@ class BXRestElapseditem {
             update: [$task, $elapseditem, $update], // Изменяет параметры записи о затраченном времени
         };
     }
-    getList(param = undefined) {
+    getList(param = {}) {
         return this.http.post(this.url.getlist, param);
     }
     add(param) {
@@ -2308,13 +2188,15 @@ class NavvySimple extends NavvySupport {
 }
 
 class NavvyPagNavBase extends NavvySupport {
-    //  load: number = 0
     constructor(requestClass, mapClass, func, param, testError = '', map = undefined) {
         super(requestClass, mapClass);
         this.func = func;
         this.param = param;
         this.testError = testError;
         this.map = map;
+        //  load: number = 0
+        this.load$ = new ReplaySubject(1);
+        this.load$.next(0.001);
     }
     resultVanilla() {
         return this.func.call(this.requestClass, this.param);
@@ -2341,57 +2223,48 @@ class NavvyPagNavBase extends NavvySupport {
  */
 class NavvyAlterPagNav extends NavvyPagNavBase {
     resultAll() {
-        return this.mapAndSnackBarError(this.getAllTaskElapsedItem(this.func.call, this.param));
+        let save = [];
+        return this.resultAllEnd()
+            .pipe(map(v => {
+            if (v) {
+                save.push(...v);
+            }
+            return save;
+        }), last(), shareReplay(1));
     }
-    /**
-     * Метод в котором все должно крутиться, не конечный вариант
-     * работаем от частного к общему
-     *
-     * @param func
-     * @param param
-     */
-    getAllTaskElapsedItem(func, param = undefined) {
-        return func.call(this.requestClass, param).pipe(mergeMap(items => {
+    resultAllEnd() {
+        // return  this.mapForVanillaEnd(this.func, this.param)
+        return this.resultVanilla().pipe(mergeMap(items => {
             if (items && items.result) {
-                if (items.next) {
-                    param = (param) ? param : {};
-                    param.PARAMS = {
-                        NAV_PARAMS: {
-                            nPageSize: this.pageSize,
-                            iNumPage: items.next / this.pageSize + 1
-                        }
-                    };
+                if (items.total && items.next) {
                     let requests = [];
-                    for (let i = 0; i < this.pageSize; i + this.pageSize) {
-                        let paramClone = clone(param);
+                    for (let i = items.next; i < items.total; i = i + this.pageSize) {
+                        let paramClone = clone(this.param);
                         paramClone.PARAMS = {
                             NAV_PARAMS: {
                                 nPageSize: this.pageSize,
-                                iNumPage: (items.next + i) / this.pageSize + 1
+                                iNumPage: i / this.pageSize + 1
                             }
                         };
                         requests.push(paramClone);
                     }
-                    return from(requests).pipe(concatMap(param => func.call(this.requestClass, param)));
-                    /*
-                    return this.getAllTaskElapsedItem(func, param).pipe(
-                      map(vEnd => {
-                        if (vEnd && vEnd.result && items.result) {
-                          return merge(clone(vEnd), {result: [...items.result, ...vEnd.result]})
+                    return concat(this.mapResultForGetAll(items), from(requests).pipe(concatMap(param => this.resultEnd(this.func, param).pipe(tap(_ => {
+                        if (param && param.PARAMS && items.total) {
+                            this.load$.next((param.PARAMS.NAV_PARAMS.iNumPage * this.pageSize + this.pageSize) / items.total);
                         }
-                        return items
-                      })
-                    )
-                     */
+                    })))));
                 }
             }
-            return from([items]);
+            return this.mapResultForGetAll(items);
         }), catchError(err => {
             // this.snackBar.error("Проблемы с поточным получение затреканого времени")
             console.error(err);
             return throwError(() => err);
         }));
     }
+    mapResultForGetAll(items) {
+        return (items?.result) ? from([items.result]).pipe(map(v => (v && this.map) ? this.map.call(this.mapClass, v) : v)) : from([]);
+    }
 }
 
 // TODO: реализовать загрузку всего в очереди
@@ -2404,7 +2277,7 @@ class NavvyPagNav extends NavvyPagNavBase {
                 save.push(...v);
             }
             return save;
-        }), last());
+        }), last(), shareReplay(1));
     }
     resultAllEnd() {
         // return  this.mapForVanillaEnd(this.func, this.param)
@@ -2504,11 +2377,116 @@ class Navvy {
     PagNavWithUselessKey(func, arg, testError = '', map = undefined) {
         return new NavvyPagNavWithUselessKey(this.requestClass, this.mapClass, func, arg, testError, map);
     }
-    alterPagNav(func, arg = undefined, testError = '', map = undefined) {
+    alterPagNav(func, arg, testError = '', map = undefined) {
         return new NavvyAlterPagNav(this.requestClass, this.mapClass, func, arg, testError, map);
     }
 }
 
+class BaseMapServices extends BaseServices {
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BaseMapServices, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BaseMapServices, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BaseMapServices, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
+class BXRestMapUser extends BaseMapServices {
+    constructor() {
+        super();
+    }
+    get(v) {
+        return (v) ? v.map(i => this.userHttpToTrace(i)) : undefined;
+    }
+    current(v) {
+        return this.userHttpToTrace(v);
+    }
+    userHttpToTrace(user) {
+        let res = Object.assign(clone(user), {
+            ID: this.toNum(user.ID),
+            IS_ONLINE: this.toBool(user.IS_ONLINE),
+            DATE_REGISTER: this.toDate(user.DATE_REGISTER),
+            PERSONAL_BIRTHDAY: this.toDate(user.PERSONAL_BIRTHDAY),
+        });
+        if (user.LAST_LOGIN) {
+            res.LAST_LOGIN = this.toDate(user.LAST_LOGIN);
+        }
+        return res;
+    }
+    BXtoHttp(user) {
+        return Object.assign(clone(user), {
+            ID: this.toStr(user.ID),
+            IS_ONLINE: this.toBXYorN(user.IS_ONLINE),
+            DATE_REGISTER: this.getBXStrTime(user.DATE_REGISTER),
+            PERSONAL_BIRTHDAY: this.toStr(user.PERSONAL_BIRTHDAY),
+            LAST_LOGIN: this.toStr(user.LAST_LOGIN)
+        });
+    }
+    getFIO(user) {
+        let res = '';
+        if (!user.LAST_NAME) {
+            const SECOND_NAME = (user.SECOND_NAME) ? user.SECOND_NAME : '';
+            const NAME = (user.NAME) ? user.NAME : '';
+            res = NAME + ' ' + SECOND_NAME;
+        }
+        else if (!user.NAME) {
+            res = user.LAST_NAME;
+        }
+        else if (!user.SECOND_NAME) {
+            res = user.LAST_NAME + ' ' + user.NAME;
+        }
+        else {
+            res = user.LAST_NAME + ' ' + user.NAME + ' ' + user.SECOND_NAME;
+        }
+        return res.trim();
+    }
+    getFI(user) {
+        let res = '';
+        if (!user.LAST_NAME) {
+            const NAME = (user.NAME) ? user.NAME : '';
+            res = NAME;
+        }
+        else if (!user.NAME) {
+            res = user.LAST_NAME;
+        }
+        else {
+            res = user.LAST_NAME + ' ' + user.NAME;
+        }
+        return res.trim();
+    }
+    getFIOShort(user) {
+        let res = '';
+        if (!user.LAST_NAME) {
+            const SECOND_NAME = (user.SECOND_NAME) ? user.SECOND_NAME : '';
+            const NAME = (user.NAME) ? user.NAME : '';
+            res = NAME + ' ' + SECOND_NAME;
+        }
+        else if (!user.NAME) {
+            res = user.LAST_NAME;
+        }
+        else if (!user.SECOND_NAME) {
+            res = user.LAST_NAME + ' ' + user.NAME.charAt(0).toUpperCase() + '.';
+        }
+        else {
+            res =
+                user.LAST_NAME + ' ' +
+                    user.NAME.charAt(0).toUpperCase() + '.' +
+                    user.SECOND_NAME.charAt(0).toUpperCase() + '.';
+        }
+        return res.trim();
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapUser, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapUser, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapUser, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return []; } });
+
 class BXRestNavvyUserUserfield {
     constructor(BXRestUserUserfield) {
         this.BXRestUserUserfield = BXRestUserUserfield;
@@ -2550,6 +2528,26 @@ class BXRestNavvyUser {
     }
     /*
     update(user: iBXRestUser, fieldUpdate: string[]) {
+  
+        if (fieldUpdate && fieldUpdate.length) {
+        let sendData: any = {
+          ID: user.ID,
+        }
+        const userBX = this.BXRestUserMap.BXtoHttp(user)
+        for (const field of fieldUpdate) {
+          if (userBX[field]) {
+            sendData[field] = userBX[field]
+          } else {
+            return throwError(() => 'One sent field is empty')
+          }
+        }
+        return this.http.post<iBXRestUserHttp[]>(
+          this.url.update,
+          sendData
+        )
+      } else {
+        return throwError(() => 'All sent field for edit is empty')
+      }
       return this.Navvy.simple(
         this.BXRestUser.update(user, fieldUpdate),
         'Не удалось обновить пользователя с ID' + user.ID
@@ -2673,7 +2671,7 @@ class BXRestNavvyUser {
             delete params.FILTER.UF_DEPARTMENT;
         }
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyUser, deps: [{ token: BXRestUserMap }, { token: BXRestUser }, { token: BXRestNavvyUserUserfield }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyUser, deps: [{ token: BXRestMapUser }, { token: BXRestUser }, { token: BXRestNavvyUserUserfield }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyUser, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyUser, decorators: [{
@@ -2681,7 +2679,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImpor
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: BXRestUserMap }, { type: BXRestUser }, { type: BXRestNavvyUserUserfield }]; } });
+        }], ctorParameters: function () { return [{ type: BXRestMapUser }, { type: BXRestUser }, { type: BXRestNavvyUserUserfield }]; } });
 
 class BXRestMapListsField {
     get(v) {
@@ -2760,6 +2758,11 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImpor
         }], ctorParameters: function () { return [{ type: BXRestListsElement }, { type: BXRestMapListsElement }]; } });
 
 class BXRestMapLists extends BaseMapServices {
+    constructor(element, field) {
+        super();
+        this.element = element;
+        this.field = field;
+    }
     get(value) {
         return (value) ? value.map(i => this.iBXRestListItemHttpToiBXRestListItem(i)) : undefined;
     }
@@ -2813,7 +2816,7 @@ class BXRestMapLists extends BaseMapServices {
             XML_ID: this.toStr(itemLists.XML_ID),
         };
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapLists, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapLists, deps: [{ token: BXRestMapListsElement }, { token: BXRestMapListsField }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapLists, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapLists, decorators: [{
@@ -2821,7 +2824,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImpor
             args: [{
                     providedIn: 'root'
                 }]
-        }] });
+        }], ctorParameters: function () { return [{ type: BXRestMapListsElement }, { type: BXRestMapListsField }]; } });
 
 class BXRestNavvyLists {
     constructor(element, field, mapList, BXRestLists) {
@@ -2884,6 +2887,25 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImpor
                 }]
         }] });
 
+class BXRestNavvyOperationElapseditem {
+    constructor(BXRestNavvyElapseditem) {
+        this.BXRestNavvyElapseditem = BXRestNavvyElapseditem;
+    }
+    getByInterval(idsUsers, dateStart, dateEnd) {
+        const param = {
+            ORDER: {
+                ID: 'DESC'
+            },
+            FILTER: {
+                USER_ID: idsUsers,
+                '>=CREATED_DATE': dateStart.toLocaleString('ru-Ru'),
+                '<=CREATED_DATE': dateEnd.toLocaleString('ru-Ru'),
+            }
+        };
+        return this.BXRestNavvyElapseditem.getList(param);
+    }
+}
+
 class BXRestMapTasksTask extends BaseMapServices {
     getaccess(v) {
         return (v && v.allowedActions) ? v.allowedActions : undefined;
@@ -3236,56 +3258,44 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImpor
                 }]
         }], ctorParameters: function () { return [{ type: BXRestNavvyTasksTask }]; } });
 
-class BXRestMapTaskElapseditem {
+class BXRestMapTaskElapseditem extends BaseMapServices {
     update(p) {
         return (p == null);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTaskElapseditem, deps: [], 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(BXRestElapseditem, BXRestMapElapseditem) {
-        this.BXRestElapseditem = BXRestElapseditem;
-        this.BXRestMapElapseditem = BXRestMapElapseditem;
-        this.Navvy = new Navvy(this.BXRestElapseditem, this.BXRestMapElapseditem);
+    getList(v) {
+        return (v) ? v.map(i => this.ElapsedItemHttpToElapsedItem(i)) : undefined;
     }
-    getByInterval(idsUsers, dateStart, dateEnd) {
-        return this.Navvy.simpleWithArg(this.BXRestElapseditem.getList, {
-            ORDER: {
-                ID: 'DESC'
-            },
-            FILTER: {
-                USER_ID: idsUsers,
-                '>=CREATED_DATE': dateStart.toLocaleString('ru-Ru'),
-                '<=CREATED_DATE': dateEnd.toLocaleString('ru-Ru'),
-            }
+    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: BXRestNavvyOperationElapseditem, deps: [{ token: BXRestElapseditem }, { token: BXRestMapTaskElapseditem }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyOperationElapseditem, providedIn: 'root' }); }
+    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: BXRestNavvyOperationElapseditem, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTaskElapseditem, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: BXRestElapseditem }, { type: BXRestMapTaskElapseditem }]; } });
+        }] });
 
 class BXRestNavvyElapseditem {
-    constructor(BXRestElapseditem, BXRestNavvyUser, BXRestNavvyTasks, BXRestMapElapseditem, operation) {
+    constructor(BXRestElapseditem, BXRestNavvyUser, BXRestNavvyTasks, BXRestMapElapseditem) {
         this.BXRestElapseditem = BXRestElapseditem;
         this.BXRestNavvyUser = BXRestNavvyUser;
         this.BXRestNavvyTasks = BXRestNavvyTasks;
         this.BXRestMapElapseditem = BXRestMapElapseditem;
-        this.operation = operation;
         this.Navvy = new Navvy(this.BXRestElapseditem, this.BXRestMapElapseditem);
+        this.operation = new BXRestNavvyOperationElapseditem(this);
     }
     /*
     call(methodName: string, ...args: any[]){
@@ -3295,7 +3305,7 @@ class BXRestNavvyElapseditem {
       return this[methodName](...args);
     }
      */
-    getList(param = undefined) {
+    getList(param = {}) {
         if (param) {
             if (!param.TASKID && !param.SELECT) {
                 param.SELECT = ['*'];
@@ -3309,7 +3319,7 @@ class BXRestNavvyElapseditem {
                 };
             }
         }
-        return this.Navvy.alterPagNav(this.BXRestElapseditem.getList, param);
+        return this.Navvy.alterPagNav(this.BXRestElapseditem.getList, param, 'Не удалось получить список затраченного на задачу(-и) времени', this.BXRestMapElapseditem.getList);
     }
     add(param) {
         return this.checkPermissionReadTask(param.TASKID).pipe(mergeMap(allowedReadTask => {
@@ -3527,7 +3537,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: BXRestElapseditem }, { token: BXRestNavvyUser }, { token: BXRestNavvyTasks }, { token: BXRestMapTaskElapseditem }, { token: BXRestNavvyOperationElapseditem }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestNavvyElapseditem, deps: [{ token: BXRestElapseditem }, { token: BXRestNavvyUser }, { token: BXRestNavvyTasks }, { token: BXRestMapTaskElapseditem }], 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: [{
@@ -3535,7 +3545,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImpor
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: BXRestElapseditem }, { type: BXRestNavvyUser }, { type: BXRestNavvyTasks }, { type: BXRestMapTaskElapseditem }, { type: BXRestNavvyOperationElapseditem }]; } });
+        }], ctorParameters: function () { return [{ type: BXRestElapseditem }, { type: BXRestNavvyUser }, { type: BXRestNavvyTasks }, { type: BXRestMapTaskElapseditem }]; } });
 
 class BXRestNavvyTask {
     constructor(elapseditem) {
@@ -4389,6 +4399,246 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImpor
                 }]
         }], ctorParameters: function () { return [{ type: BXRestMapLists }]; } });
 
+class BXRestMapCalendar {
+    constructor(event) {
+        this.event = event;
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapCalendar, deps: [{ token: BXRestMapCalendarEvent }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapCalendar, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapCalendar, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: BXRestMapCalendarEvent }]; } });
+
+class BXRestMapLogBlogPost extends BaseMapServices {
+    get(item) {
+        return (item) ? item.map(i => this.iBlogPostBXHttpToiBlogPostBX(i)) : undefined;
+    }
+    iBlogPostBXHttpToiBlogPostBX(item) {
+        return {
+            AUTHOR_ID: this.toNum(item.AUTHOR_ID),
+            BLOG_ID: this.toNum(item.BLOG_ID),
+            CATEGORY_ID: this.toNum(item.CATEGORY_ID),
+            DATE_PUBLISH: this.toDate(item.DATE_PUBLISH),
+            ENABLE_COMMENTS: item.ENABLE_COMMENTS === 'Y',
+            HAS_COMMENT_IMAGES: item.HAS_COMMENT_IMAGES === 'Y',
+            HAS_SOCNET_ALL: item.HAS_SOCNET_ALL === 'Y',
+            HAS_IMAGES: item.HAS_IMAGES === 'Y',
+            HAS_PROPS: item.HAS_PROPS === 'Y',
+            HAS_TAGS: item.HAS_TAGS === 'Y',
+            TITLE: item.TITLE,
+            ID: this.toNum(item.ID),
+            MICRO: item.MICRO === 'Y',
+            PUBLISH_STATUS: item.PUBLISH_STATUS,
+            NUM_COMMENTS: this.toNum(item.NUM_COMMENTS),
+            UF_ANSWER_ID: this.iBlogPostEssenceHttpToiBlogPostEssence(item.UF_ANSWER_ID),
+            UF_BLOG_POST_DOC: this.iBlogPostEssenceHttpToiBlogPostEssence(item.UF_BLOG_POST_DOC),
+            UF_BLOG_POST_FILE: this.iBlogPostEssenceHttpToiBlogPostEssence(item.UF_BLOG_POST_FILE),
+            UF_BLOG_POST_F_EDIT: this.iBlogPostEssenceHttpToiBlogPostEssence(item.UF_BLOG_POST_F_EDIT),
+            UF_BLOG_POST_IMPRTNT: this.iBlogPostEssenceHttpToiBlogPostEssence(item.UF_BLOG_POST_IMPRTNT),
+            UF_BLOG_POST_URL_PRV: this.iBlogPostEssenceHttpToiBlogPostEssence(item.UF_BLOG_POST_URL_PRV),
+            UF_BLOG_POST_VOTE: this.iBlogPostEssenceHttpToiBlogPostEssence(item.UF_BLOG_POST_VOTE),
+            UF_CATEGORY_CODE: this.iBlogPostEssenceHttpToiBlogPostEssence(item.UF_CATEGORY_CODE),
+            UF_GRATITUDE: this.iBlogPostEssenceHttpToiBlogPostEssence(item.UF_GRATITUDE),
+            UF_IMPRTANT_DATE_END: this.iBlogPostEssenceHttpToiBlogPostEssence(item.UF_IMPRTANT_DATE_END),
+            UF_MAIL_MESSAGE: this.iBlogPostEssenceHttpToiBlogPostEssence(item.UF_MAIL_MESSAGE),
+            UF_ORIGINAL_ID: this.iBlogPostEssenceHttpToiBlogPostEssence(item.UF_ORIGINAL_ID),
+            UF_STATUS: this.iBlogPostEssenceHttpToiBlogPostEssence(item.UF_STATUS),
+            CODE: item.CODE,
+            DETAIL_TEXT: item.DETAIL_TEXT,
+            FILES: (item.FILES) ? item.FILES.map(i => this.toNum(i)) : []
+        };
+    }
+    iBlogPostEssenceHttpToiBlogPostEssence(item) {
+        if (item) {
+            return {
+                EDIT_IN_LIST: item.EDIT_IN_LIST === 'Y',
+                ID: this.toNum(item.ID),
+                IS_SEARCHABLE: item.IS_SEARCHABLE === 'Y',
+                MANDATORY: item.MANDATORY === 'Y',
+                MULTIPLE: item.MULTIPLE === 'Y',
+                SHOW_FILTER: item.SHOW_FILTER === 'Y',
+                SHOW_IN_LIST: item.SHOW_IN_LIST === 'Y',
+                SORT: this.toNum(item.SORT),
+                EDIT_FORM_LABEL: item.EDIT_FORM_LABEL,
+                ENTITY_ID: item.EDIT_FORM_LABEL,
+                ENTITY_VALUE_ID: this.toNum(item.ENTITY_VALUE_ID),
+                ERROR_MESSAGE: item.ERROR_MESSAGE,
+                FIELD_NAME: item.FIELD_NAME,
+                HELP_MESSAGE: item.HELP_MESSAGE,
+                LIST_COLUMN_LABEL: item.HELP_MESSAGE,
+                LIST_FILTER_LABEL: item.LIST_FILTER_LABEL,
+                SETTINGS: item.SETTINGS,
+                USER_TYPE: item.USER_TYPE,
+                USER_TYPE_ID: item.USER_TYPE_ID,
+                VALUE: item.SHOW_IN_LIST === 'Y',
+                XML_ID: item.XML_ID // ??
+            };
+        }
+        else {
+            return undefined;
+        }
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapLogBlogPost, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapLogBlogPost, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapLogBlogPost, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
+class BXRestMapLog {
+    constructor(blogpost) {
+        this.blogpost = blogpost;
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapLog, deps: [{ token: BXRestMapLogBlogPost }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapLog, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapLog, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: BXRestMapLogBlogPost }]; } });
+
+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 BXRestMapTaskResult extends BaseMapServices {
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTaskResult, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTaskResult, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTaskResult, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
+class BXRestMapTaskStage extends BaseMapServices {
+    get(value) {
+        return (value) ? value.map(i => Object.assign(i, {
+            SORT: this.toNum(i.SORT),
+            ID: this.toNum(i.ID),
+            ENTITY_ID: this.toNum(i.ENTITY_ID)
+        })) : undefined;
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTaskStage, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTaskStage, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTaskStage, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
+class BXRestMapTask {
+    constructor(commentItem, elapsedItem, result, stages) {
+        this.commentItem = commentItem;
+        this.elapsedItem = elapsedItem;
+        this.result = result;
+        this.stages = stages;
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTask, deps: [{ token: BXRestMapTaskCommentItem }, { token: BXRestMapTaskElapseditem }, { token: BXRestMapTaskResult }, { token: BXRestMapTaskStage }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTask, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTask, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: BXRestMapTaskCommentItem }, { type: BXRestMapTaskElapseditem }, { type: BXRestMapTaskResult }, { type: BXRestMapTaskStage }]; } });
+
+class BXRestMapTasks {
+    constructor(task) {
+        this.task = task;
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTasks, deps: [{ token: BXRestMapTasksTask }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTasks, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: BXRestMapTasks, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: BXRestMapTasksTask }]; } });
+
+let Map$1 = class Map {
+    constructor(user, sonet_group, server, lists, disk, calendar, log, task, tasks) {
+        this.user = user;
+        this.sonet_group = sonet_group;
+        this.server = server;
+        this.lists = lists;
+        this.disk = disk;
+        this.calendar = calendar;
+        this.log = log;
+        this.task = task;
+        this.tasks = tasks;
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: Map, deps: [{ token: BXRestMapUser }, { token: BXRestMapSonetGroup }, { token: BXRestMapServer }, { token: BXRestMapLists }, { token: BXRestDisk }, { token: BXRestMapCalendar }, { token: BXRestMapLog }, { token: BXRestMapTask }, { token: BXRestMapTasks }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: Map, providedIn: 'root' }); }
+};
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImport: i0, type: Map$1, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: BXRestMapUser }, { type: BXRestMapSonetGroup }, { type: BXRestMapServer }, { type: BXRestMapLists }, { type: BXRestDisk }, { type: BXRestMapCalendar }, { type: BXRestMapLog }, { type: BXRestMapTask }, { type: BXRestMapTasks }]; } });
+
 /*
  * Public API Surface of bx-rest
  */
@@ -4397,5 +4647,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.6", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { BXRest, BXRestMap, BXRestMapResult, BXRestNavvy, BX_REST_SETTINGS, Navvy };
+export { Map$1 as BXMap, BXRest, BXRestMap, BXRestMapResult, BXRestNavvy, BX_REST_SETTINGS, Navvy };
 //# sourceMappingURL=bx-rest.mjs.map