bx-rest 0.4.6 → 0.4.7

package/fesm2022/bx-rest.mjs

@@ -53,7 +53,6 @@ class NavvySupport {
     }
     mapAndError(request) {
         return request.pipe(map(v => BXRestMapResult(v)), catchError(err => {
-            // this.snackBar.error(errorText)
             return throwError(() => err);
         }));
     }
@@ -78,7 +77,7 @@ class NavvySimple extends NavvySupport {
     //   ) as ReturnTypeNavvy<Observable<iBXRestAnswer<T | undefined>>, Observable<iBXRestAnswer<R | undefined>>>
     // }
     result() {
-        return this.mapAndError(this.func).pipe(map(v => (v && this.map) ? this.map.call(this.mapClass, v) : v));
+        return this.mapAndError(this.func).pipe(map(v => (this.map) ? this.map.call(this.mapClass, v) : v));
     }
 }
 
@@ -409,7 +408,8 @@ const $updateTitle = 'updateTitle';
 const $updateColor = 'updateColor';
 const $updateAvatar = 'updateAvatar';
 const $setOwner = 'setOwner';
-const $mute = 'mute';
+const $mute = 'mute';
+const $timeMan = 'timeman';
 
 var partNameMethods$1 = /*#__PURE__*/Object.freeze({
   __proto__: null,
@@ -498,6 +498,7 @@ var partNameMethods$1 = /*#__PURE__*/Object.freeze({
   $template: $template,
   $terminate: $terminate,
   $time: $time,
+  $timeMan: $timeMan,
   $type: $type,
   $update: $update,
   $updateAvatar: $updateAvatar,
@@ -1469,17 +1470,17 @@ class BXRestTaskElapsedItem {
     constructor(http) {
         this.http = http;
         this.url = {
-            getmanifest: [$task, $elapseditem, $getmanifest],
-            getlist: [$task, $elapseditem, $getlist],
+            getManifest: [$task, $elapseditem, $getmanifest],
+            getList: [$task, $elapseditem, $getlist],
             get: [$task, $elapseditem, $get],
             add: [$task, $elapseditem, $add],
             delete: [$task, $elapseditem, $delete],
-            isactionallowed: [$task, $elapseditem, $isactionallowed],
+            isActionAllowed: [$task, $elapseditem, $isactionallowed],
             update: [$task, $elapseditem, $update], // Изменяет параметры записи о затраченном времени
         };
     }
     getList(param = {}) {
-        return this.http.post(this.url.getlist, param);
+        return this.http.post(this.url.getList, param);
     }
     add(param) {
         return this.http.post(this.url.add, param, {
@@ -1511,7 +1512,7 @@ class BXRestTaskElapsedItem {
      * @param param
      */
     isActionAllowed(param) {
-        return this.http.post(this.url.isactionallowed, param);
+        return this.http.post(this.url.isActionAllowed, param);
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestTaskElapsedItem, deps: [{ token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestTaskElapsedItem, providedIn: 'root' }); }
@@ -1527,13 +1528,13 @@ class BXRestTaskCommentItem {
     constructor(http) {
         this.http = http;
         this.url = {
-            getmanifest: [$task, $commentitem, $getmanifest],
-            getlist: [$task, $commentitem, $getlist],
+            getManifest: [$task, $commentitem, $getmanifest],
+            getList: [$task, $commentitem, $getlist],
             get: [$task, $commentitem, $get],
             add: [$task, $commentitem, $add],
             update: [$task, $commentitem, $update],
             delete: [$task, $commentitem, $delete],
-            isactionallowed: [$task, $commentitem, $isactionallowed], // Проверяет, разрешено ли действие
+            isActionAllowed: [$task, $commentitem, $isactionallowed], // Проверяет, разрешено ли действие
         };
     }
     add(param) {
@@ -1546,7 +1547,7 @@ class BXRestTaskCommentItem {
         return this.http.post(this.url.get, param);
     }
     getlist(param) {
-        return this.http.post(this.url.getlist, param);
+        return this.http.post(this.url.getList, param);
     }
     del(param) {
         return this.http.post(this.url.delete, param);
@@ -2449,6 +2450,54 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.11", ngImpo
                 }]
         }], ctorParameters: function () { return [{ type: HttpBXServices }]; } });
 
+class BXRestTimeMan {
+    constructor(http) {
+        this.http = http;
+        this.url = {
+            settings: [$timeMan, $settings],
+            status: [$timeMan, $status],
+            open: [$timeMan, 'open'],
+            close: [$timeMan, 'close'],
+            pause: [$timeMan, $pause], // Приостановить рабочий день
+            // networkrange: {
+            //   check: this.baseUrl + 'networkrange.check', // Метод для проверки IP-адреса на вхождение в диапазоны сетевых адресов офисной сети
+            //   get: this.baseUrl + 'networkrange.get', // Метод для получения диапазонов сетевых адресов, входящих в офисную сеть
+            //   set: this.baseUrl + 'networkrange.set'	// Метод для установки диапазонов сетевых адресов, входящих в офисную сеть.	18.5.0
+            // },
+            // timecontrol: {
+            //   report: {
+            //     add: this.baseUrl + 'timecontrol.report.add', // Метод для отправки отчета о выявленном отсутствии
+            //     get: this.baseUrl + 'timecontrol.reports.get', // Метод для получения отчета о выявленных отсутствиях
+            //     settings: {
+            //       get: this.baseUrl + 'timecontrol.reports.settings.get' // Метод для получения пользовательских настроек для построения интерфейса отчетов инструмента контроля времени
+            //     },
+            //     users: {
+            //       get: this.baseUrl + 'timecontrol.reports.users.get'	// Метод для получения списка пользователей, относящихся к указанному подразделению.	18.5.0
+            //     }
+            //   },
+            //   settings: {
+            //     get: this.baseUrl + 'timecontrol.settings.get', // Метод для получения настроек инструмента контроля времени
+            //     set: this.baseUrl + 'timecontrol.settings.set'	// Метод для установки настроек инструмента контроля времени
+            //   },
+            // },
+            // schedule: {
+            //   get: this.baseUrl + 'schedule.get'	// Метод позволяет получить рабочий график по его идентификатору
+            // }
+        };
+    }
+    status(param = undefined) {
+        return this.http.post(this.url.status, param);
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestTimeMan, deps: [{ token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestTimeMan, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestTimeMan, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: HttpBXServices }]; } });
+
 class BaseMapServices extends BaseServices {
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BaseMapServices, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BaseMapServices, providedIn: 'root' }); }
@@ -2468,7 +2517,7 @@ class BXRestMapUser extends BaseMapServices {
         return (v) ? v.map(i => this.userHttpToTrace(i)) : undefined;
     }
     current(v) {
-        return this.userHttpToTrace(v);
+        return (v) ? this.userHttpToTrace(v) : undefined;
     }
     userHttpToTrace(user) {
         let res = Object.assign(clone(user), {
@@ -2573,10 +2622,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.11", ngImpo
         }], ctorParameters: function () { return [{ type: BXRestUserUserfield }]; } });
 
 class BXRestNavvyUser {
-    constructor(BXRestUserMap, BXRestUser, userfield) {
+    constructor(BXRestUserMap, BXRestUser, userField) {
         this.BXRestUserMap = BXRestUserMap;
         this.BXRestUser = BXRestUser;
-        this.userfield = userfield;
+        this.userField = userField;
         this.def = {
             params: { ACTIVE: 1, start: 0 }
         };
@@ -2898,48 +2947,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.11", ngImpo
                 }]
         }], ctorParameters: function () { return [{ type: BXRestNavvyListsElement }, { type: BXRestNavvyListsField }, { type: BXRestMapLists }, { type: BXRestLists }]; } });
 
-class Permission {
-    static get() {
-        return SessionStorage.getItem('permission');
-    }
-    static set(param) {
-        SessionStorage.setItem('permission', Object.assign(this.get(), param));
-    }
-    static setTaskElapsedItem(idTask, ElapsedItem) {
-        let permission = Permission.get();
-        if (permission.tasks) {
-            let findTask = permission.tasks.find(i => i.id === idTask);
-            if (findTask) {
-                let findTaskElapsedItem = findTask.elapsedItem.find(i => i.id === ElapsedItem.id);
-                if (findTaskElapsedItem) {
-                    if (ElapsedItem.verified.edit) {
-                        findTaskElapsedItem.verified.edit = ElapsedItem.verified.edit;
-                        findTaskElapsedItem.edit = ElapsedItem.edit;
-                    }
-                    if (ElapsedItem.verified.del) {
-                        findTaskElapsedItem.verified.del = ElapsedItem.verified.del;
-                        findTaskElapsedItem.del = ElapsedItem.del;
-                    }
-                }
-                else {
-                    findTask.elapsedItem.push(ElapsedItem);
-                }
-            }
-            SessionStorage.setItem('permission', permission);
-        }
-    }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: Permission, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: Permission, providedIn: 'root' }); }
-}
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: Permission, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }] });
-
 class BXRestMapTaskElapsedItem extends BaseMapServices {
     update(p) {
+        console.log('update', p);
         return (p == null);
     }
     getList(v) {
@@ -3344,7 +3354,8 @@ class BXRestNavvyOperationElapsedItem {
             };
         })).pipe(map(v => {
             if (v && v.length) {
-                return this.http.mapBranchResultWithoutKey(v).map(i => this.BXRestMapElapsedItem.getList(i)).filter((i) => i !== undefined).flat();
+                const res = this.http.mapBranchResultWithoutKey(v);
+                return this.BXRestMapElapsedItem.getList(res);
             }
             return undefined;
         }));
@@ -3366,7 +3377,7 @@ class BXRestNavvyOperationElapsedItem {
                     .map(i => {
                     return {
                         [i]: {
-                            name: this.http.getNameMethod([$tasks, $task, $getaccess]),
+                            name: this.http.getNameMethod([$task, $elapseditem, $isactionallowed]),
                             param: {
                                 TASKID: i,
                                 ITEMID: 1,
@@ -3389,58 +3400,67 @@ class BXRestNavvyOperationElapsedItem {
         }));
     }
     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']);
+        // 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 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);
+            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);
+        // 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)
+        //   }
+        //   console.log('idTask', idTask)
+        return this.BXRestNavvyUser.current().result().pipe(mergeMap(self => {
+            console.log('self', 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 => {
+                    console.log('v', v);
+                    return (v && v[self.ID]) ? !!v[self.ID] : false; // отдельного флага на чтение нет, выходит что если права отдались то и права есть
+                }));
             }
-            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);
+            return of(undefined);
+        }));
+        // }
+        //
+        // return of(undefined)
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestNavvyOperationElapsedItem, deps: [{ token: HttpBXServices }, { token: BXRestNavvyDelegateElapsedItem }, { token: BXRestMapTaskElapsedItem }, { token: BXRestNavvyUser }, { token: BXRestNavvyTasks }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestNavvyOperationElapsedItem, providedIn: 'root' }); }
@@ -3472,7 +3492,13 @@ class BXRestNavvyElapsedItem {
         return this.delegate.getList(param);
     }
     add(param) {
+        return new NavvySimple(this, this.BXRestMapElapsedItem, this.addBase.call(this, param));
+        // return this.Navvy.simpleWithArg(this.addBase.bind(this), param)
+    }
+    addBase(param) {
+        console.log('this.operation', this.operation);
         return this.operation.checkPermissionReadTask(param.TASKID).pipe(mergeMap(allowedReadTask => {
+            console.log('allowedReadTask', allowedReadTask);
             if (allowedReadTask) {
                 return this.operation.checkPermissionAddElapsedTimeToTask(param.TASKID).pipe(mergeMap(allowed => {
                     if (allowed) {
@@ -3494,21 +3520,19 @@ class BXRestNavvyElapsedItem {
      * @param param
      */
     update(param) {
-        return this.Navvy.simple(() => this.operation.checkPermissionReadTask(param.TASKID).pipe(mergeMap(allowedReadTask => {
+        const func = () => 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('Отсутствуют права на изменение записи затраченного времени'));
-                    }
+                    return throwError(() => new Error('Отсутствуют права на изменение записи затраченного времени'));
                 }));
             }
-            else {
-                return throwError(() => new Error('Отсутствуют права на чтение задачи'));
-            }
-        })), this.BXRestMapElapsedItem.update);
+            return throwError(() => new Error('Отсутствуют права на чтение задачи'));
+        }));
+        console.log('this.BXRestMapElapsedItem.update', this.BXRestMapElapsedItem.update);
+        return new NavvySimple(this, this.BXRestMapElapsedItem, func.call(this), this.BXRestMapElapsedItem.update);
     }
     /*
     getAll(
@@ -3570,40 +3594,45 @@ class BXRestNavvyElapsedItem {
         )
     }
     */
+    // TODO: разобраться что это за ебатня в комментах и вписать нормальной комент если она нужна
     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);
-                }
-            }
-        }
+        // 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,
-                    }
-                });
-            }
-        }));
+            ITEMID: idItem,
+            ACTIONID: 2
+        }).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
+            ITEMID: idItem,
+            ACTIONID: 3
         }).result();
     }
     /**
@@ -3839,22 +3868,24 @@ class BXRestMapDiskBase extends BaseMapServices {
         return object && object.TYPE && object.TYPE === 'folder';
     }
     FolderHttpToFolder(value) {
-        return {
-            ...value,
-            ...{
-                CREATED_BY: this.toNum(value.CREATED_BY),
-                CREATE_TIME: this.toDate(value.CREATE_TIME),
-                DELETED_BY: this.toNum(value.DELETED_BY),
-                DELETED_TYPE: this.toNum(value.DELETED_TYPE),
-                DELETE_TIME: this.toDate(value.CREATE_TIME),
-                ID: this.toNum(value.ID),
-                PARENT_ID: this.toNum(value.PARENT_ID),
-                REAL_OBJECT_ID: this.toNum(value.REAL_OBJECT_ID),
-                STORAGE_ID: this.toNum(value.STORAGE_ID),
-                UPDATED_BY: this.toNum(value.UPDATED_BY),
-                UPDATE_TIME: this.toDate(value.CREATE_TIME)
+        return (value)
+            ? {
+                ...value,
+                ...{
+                    CREATED_BY: this.toNum(value.CREATED_BY),
+                    CREATE_TIME: this.toDate(value.CREATE_TIME),
+                    DELETED_BY: this.toNum(value.DELETED_BY),
+                    DELETED_TYPE: this.toNum(value.DELETED_TYPE),
+                    DELETE_TIME: this.toDate(value.CREATE_TIME),
+                    ID: this.toNum(value.ID),
+                    PARENT_ID: this.toNum(value.PARENT_ID),
+                    REAL_OBJECT_ID: this.toNum(value.REAL_OBJECT_ID),
+                    STORAGE_ID: this.toNum(value.STORAGE_ID),
+                    UPDATED_BY: this.toNum(value.UPDATED_BY),
+                    UPDATE_TIME: this.toDate(value.CREATE_TIME)
+                }
             }
-        };
+            : undefined;
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestMapDiskBase, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestMapDiskBase, providedIn: 'root' }); }
@@ -4031,11 +4062,11 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.11", ngImpo
         }], ctorParameters: function () { return [{ type: BXRestDiskFile }, { type: BXRestMapDiskFile }]; } });
 
 class BXRestMapDiskStorage extends BXRestMapDiskBase {
-    getchildren(arr) {
+    getChildren(arr) {
         return (arr) ? this.separationFoldersAndFiles(arr) : { file: [], folder: [] };
     }
-    addfolder(value) {
-        return this.FolderHttpToFolder(value);
+    addFolder(value) {
+        return (value) ? this.FolderHttpToFolder(value) : undefined;
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestMapDiskStorage, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestMapDiskStorage, providedIn: 'root' }); }
@@ -4171,10 +4202,10 @@ class BXRestNavvyDiskStorage {
     }
      */
     getChildren(param) {
-        return this.Navvy.simpleWithArg(this.BXRestNavvyInterlayerDiskStorage.getChildren, param, this.BXRestMapDiskStorage.getchildren);
+        return this.Navvy.simpleWithArg(this.BXRestNavvyInterlayerDiskStorage.getChildren, param, this.BXRestMapDiskStorage.getChildren);
     }
     addFolder(param) {
-        return this.Navvy.simpleWithArg(this.BXRestNavvyInterlayerDiskStorage.addFolder, param, this.BXRestMapDiskStorage.addfolder);
+        return this.Navvy.simpleWithArg(this.BXRestNavvyInterlayerDiskStorage.addFolder, param, this.BXRestMapDiskStorage.addFolder);
     }
     uploadFile(param) {
         return this.Navvy.simpleWithArg(this.BXRestNavvyInterlayerDiskStorage.uploadFile, param);
@@ -4597,7 +4628,7 @@ class BXRestNavvyRestCalendarEvent {
     constructor(BXRestCalendarEvent, eventMap) {
         this.BXRestCalendarEvent = BXRestCalendarEvent;
         this.eventMap = eventMap;
-        this.Navvy = new Navvy(this.eventMap, undefined);
+        this.Navvy = new Navvy(BXRestCalendarEvent, eventMap);
     }
     get(param) {
         return this.Navvy.simpleWithArg(this.BXRestCalendarEvent.get, param, this.eventMap.get);
@@ -4729,7 +4760,7 @@ class BXRestNavvyServer {
     constructor(BXRestServer, BXRestMapServer) {
         this.BXRestServer = BXRestServer;
         this.BXRestMapServer = BXRestMapServer;
-        this.Navvy = new Navvy(this.BXRestServer, BXRestMapServer);
+        this.Navvy = new Navvy(BXRestServer, BXRestMapServer);
     }
     time() {
         return this.Navvy.simple(this.BXRestServer.time, this.BXRestMapServer.time);
@@ -4839,7 +4870,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.11", ngImpo
 
 class BXRestMapApp extends BaseMapServices {
     info(value) {
-        return { ...value, ...{ ID: this.toNum(value.ID), PAYMENT_EXPIRED: value.PAYMENT_EXPIRED === 'Y' } };
+        return (value)
+            ? { ...value, ...{ ID: this.toNum(value.ID), PAYMENT_EXPIRED: value.PAYMENT_EXPIRED === 'Y' } }
+            : undefined;
     }
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestMapApp, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestMapApp, providedIn: 'root' }); }
@@ -4873,6 +4906,60 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.11", ngImpo
                 }]
         }], ctorParameters: function () { return [{ type: BXRestApp }, { type: BXRestMapApp }]; } });
 
+class BXRestMapTimeMan {
+    status(status) {
+        if (status) {
+            const duration = status.DURATION.split(':');
+            const time_leaks = status.TIME_LEAKS.split(':');
+            return {
+                STATUS: status.STATUS,
+                TIME_START: (status.TIME_START) ? new Date(status.TIME_START) : undefined,
+                TIME_FINISH: (status.TIME_FINISH) ? new Date(status.TIME_FINISH) : undefined,
+                DURATION: (duration.length && duration.length == 3)
+                    ? Number(duration[0]) * 60 * 60 + Number(duration[1]) * 60 + Number(duration[2]) : 0,
+                TIME_LEAKS: (time_leaks.length && time_leaks.length == 3)
+                    ? Number(time_leaks[0]) * 60 * 60 + Number(time_leaks[1]) * 60 + Number(time_leaks[2]) : 0,
+                ACTIVE: status.ACTIVE,
+                IP_OPEN: status.IP_CLOSE,
+                IP_CLOSE: status.IP_CLOSE,
+                LAT_OPEN: status.LAT_OPEN,
+                LON_OPEN: status.LON_OPEN,
+                LAT_CLOSE: status.LAT_CLOSE,
+                LON_CLOSE: status.LON_CLOSE,
+                TZ_OFFSET: status.TZ_OFFSET
+            };
+        }
+        return undefined;
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestMapTimeMan, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestMapTimeMan, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestMapTimeMan, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }] });
+
+class BXRestNavvyTimeMan {
+    constructor(BXRestTimeMan, BXRestMapTimeMan) {
+        this.BXRestTimeMan = BXRestTimeMan;
+        this.BXRestMapTimeMan = BXRestMapTimeMan;
+        this.Navvy = new Navvy(BXRestTimeMan, BXRestMapTimeMan);
+    }
+    status(param = undefined) {
+        return this.Navvy.simpleWithArg(this.BXRestTimeMan.status, param, this.BXRestMapTimeMan.status);
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestNavvyTimeMan, deps: [{ token: BXRestTimeMan }, { token: BXRestMapTimeMan }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestNavvyTimeMan, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestNavvyTimeMan, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: BXRestTimeMan }, { type: BXRestMapTimeMan }]; } });
+
 class BXRestMaps extends BaseMapServices {
     profile(user) {
         return (user) ? { ...user, ...{ ID: this.toNum(user.ID) } } : undefined;
@@ -4888,7 +4975,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.11", ngImpo
         }] });
 
 class BXRest {
-    constructor(user, lists, task, tasks, disk, bizProc, log, calendar, sonet_group, server, department, im, app, http) {
+    constructor(user, lists, task, tasks, disk, bizProc, log, calendar, sonet_group, server, department, im, app, timeMan, http) {
         this.user = user;
         this.lists = lists;
         this.task = task;
@@ -4902,12 +4989,13 @@ class BXRest {
         this.department = department;
         this.im = im;
         this.app = app;
+        this.timeMan = timeMan;
         this.http = http;
     }
     profile() {
         return this.http.post(['profile']);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRest, deps: [{ token: BXRestUser }, { token: BXRestLists }, { token: BXRestTask }, { token: BXRestTasks }, { token: BXRestDisk }, { token: BXRestBizProc }, { token: BXRestLog }, { token: BXRestCalendar }, { token: BXRestSonetGroup }, { token: BXRestServer }, { token: BXRestDepartment }, { token: BXRestIm }, { token: BXRestApp }, { token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRest, deps: [{ token: BXRestUser }, { token: BXRestLists }, { token: BXRestTask }, { token: BXRestTasks }, { token: BXRestDisk }, { token: BXRestBizProc }, { token: BXRestLog }, { token: BXRestCalendar }, { token: BXRestSonetGroup }, { token: BXRestServer }, { token: BXRestDepartment }, { token: BXRestIm }, { token: BXRestApp }, { token: BXRestTimeMan }, { token: HttpBXServices }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRest, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRest, decorators: [{
@@ -4915,9 +5003,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.11", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: BXRestUser }, { type: BXRestLists }, { type: BXRestTask }, { type: BXRestTasks }, { type: BXRestDisk }, { type: BXRestBizProc }, { type: BXRestLog }, { type: BXRestCalendar }, { type: BXRestSonetGroup }, { type: BXRestServer }, { type: BXRestDepartment }, { type: BXRestIm }, { type: BXRestApp }, { type: HttpBXServices }]; } });
+        }], ctorParameters: function () { return [{ type: BXRestUser }, { type: BXRestLists }, { type: BXRestTask }, { type: BXRestTasks }, { type: BXRestDisk }, { type: BXRestBizProc }, { type: BXRestLog }, { type: BXRestCalendar }, { type: BXRestSonetGroup }, { type: BXRestServer }, { type: BXRestDepartment }, { type: BXRestIm }, { type: BXRestApp }, { type: BXRestTimeMan }, { type: HttpBXServices }]; } });
 class BXRestNavvy {
-    constructor(user, lists, task, tasks, disk, bizProc, log, calendar, sonet_group, server, department, im, app, BXRest, BXRestMap) {
+    constructor(user, lists, task, tasks, disk, bizProc, log, calendar, sonet_group, server, department, im, app, timeMan, BXRest, BXRestMap) {
         this.user = user;
         this.lists = lists;
         this.task = task;
@@ -4931,6 +5019,7 @@ class BXRestNavvy {
         this.department = department;
         this.im = im;
         this.app = app;
+        this.timeMan = timeMan;
         this.BXRest = BXRest;
         this.BXRestMap = BXRestMap;
         this.Navvy = new Navvy(this.BXRest, this.BXRestMap);
@@ -4938,7 +5027,7 @@ class BXRestNavvy {
     profile() {
         return this.Navvy.simple(this.BXRest.profile, this.BXRestMap.profile);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestNavvy, deps: [{ token: BXRestNavvyUser }, { token: BXRestNavvyLists }, { token: BXRestNavvyTask }, { token: BXRestNavvyTasks }, { token: BXRestNavvyDisk }, { token: BXRestNavvyBizProc }, { token: BXRestNavvyLog }, { token: BXRestNavvyCalendar }, { token: BXRestNavvySonetGroup }, { token: BXRestNavvyServer }, { token: BXRestNavvyDepartment }, { token: BXRestNavvyIm }, { token: BXRestNavvyApp }, { token: BXRest }, { token: BXRestMaps }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestNavvy, deps: [{ token: BXRestNavvyUser }, { token: BXRestNavvyLists }, { token: BXRestNavvyTask }, { token: BXRestNavvyTasks }, { token: BXRestNavvyDisk }, { token: BXRestNavvyBizProc }, { token: BXRestNavvyLog }, { token: BXRestNavvyCalendar }, { token: BXRestNavvySonetGroup }, { token: BXRestNavvyServer }, { token: BXRestNavvyDepartment }, { token: BXRestNavvyIm }, { token: BXRestNavvyApp }, { token: BXRestNavvyTimeMan }, { token: BXRest }, { token: BXRestMaps }], target: i0.ɵɵFactoryTarget.Injectable }); }
     static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestNavvy, providedIn: 'root' }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.11", ngImport: i0, type: BXRestNavvy, decorators: [{
@@ -4946,7 +5035,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.11", ngImpo
             args: [{
                     providedIn: 'root'
                 }]
-        }], ctorParameters: function () { return [{ type: BXRestNavvyUser }, { type: BXRestNavvyLists }, { type: BXRestNavvyTask }, { type: BXRestNavvyTasks }, { type: BXRestNavvyDisk }, { type: BXRestNavvyBizProc }, { type: BXRestNavvyLog }, { type: BXRestNavvyCalendar }, { type: BXRestNavvySonetGroup }, { type: BXRestNavvyServer }, { type: BXRestNavvyDepartment }, { type: BXRestNavvyIm }, { type: BXRestNavvyApp }, { type: BXRest }, { type: BXRestMaps }]; } });
+        }], ctorParameters: function () { return [{ type: BXRestNavvyUser }, { type: BXRestNavvyLists }, { type: BXRestNavvyTask }, { type: BXRestNavvyTasks }, { type: BXRestNavvyDisk }, { type: BXRestNavvyBizProc }, { type: BXRestNavvyLog }, { type: BXRestNavvyCalendar }, { type: BXRestNavvySonetGroup }, { type: BXRestNavvyServer }, { type: BXRestNavvyDepartment }, { type: BXRestNavvyIm }, { type: BXRestNavvyApp }, { type: BXRestNavvyTimeMan }, { type: BXRest }, { type: BXRestMaps }]; } });
 class BXRestMap {
     constructor(lists) {
         this.lists = lists;