general-library-union 2.3.49 → 2.3.51
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2022/src/app/core/servicios/menu.service.mjs +5 -8
- package/fesm2022/general-library-union.mjs +4 -7
- package/fesm2022/general-library-union.mjs.map +1 -1
- package/package.json +1 -1
- package/src/app/layout/app.menuitem.component.d.ts +1 -1
- package/src/app/webcommon/pages/fuente/importar-fuente-con/importar-fuente-con.component.d.ts +1 -1
|
@@ -36,7 +36,6 @@ export class MenuService {
|
|
|
36
36
|
* @returns
|
|
37
37
|
*/
|
|
38
38
|
loadTareas() {
|
|
39
|
-
console.log('entra loadTareas menuservice');
|
|
40
39
|
/********************************************************/
|
|
41
40
|
/* Se debe cambiar con el request al servicio de tareas */
|
|
42
41
|
this._menu = {};
|
|
@@ -59,13 +58,13 @@ export class MenuService {
|
|
|
59
58
|
if (unNodo.tipo !== "M") {
|
|
60
59
|
continue;
|
|
61
60
|
}
|
|
62
|
-
if (unaTarea.nombreAbuelo && unNodo.descripcion === unaTarea.nombreAbuelo) {
|
|
61
|
+
if (unaTarea.nombreAbuelo && unNodo.descripcion === unaTarea.nombreAbuelo && unNodo.modulo === unaTarea.modulo) {
|
|
63
62
|
// Buscar en el segundo nivel
|
|
64
63
|
for (const unNodo2 of unNodo.listaTareas || []) {
|
|
65
64
|
if (unNodo2.tipo !== "M") {
|
|
66
65
|
continue;
|
|
67
66
|
}
|
|
68
|
-
if (unNodo2.descripcion === unaTarea.nombrePadre) {
|
|
67
|
+
if (unNodo2.descripcion === unaTarea.nombrePadre && unNodo2.modulo === unaTarea.modulo) {
|
|
69
68
|
nodoBase = unNodo2;
|
|
70
69
|
break;
|
|
71
70
|
}
|
|
@@ -83,7 +82,7 @@ export class MenuService {
|
|
|
83
82
|
}
|
|
84
83
|
break;
|
|
85
84
|
}
|
|
86
|
-
if (unNodo.descripcion === unaTarea.nombrePadre) {
|
|
85
|
+
if (unNodo.descripcion === unaTarea.nombrePadre && unNodo.modulo === unaTarea.modulo) {
|
|
87
86
|
nodoBase = unNodo;
|
|
88
87
|
break;
|
|
89
88
|
}
|
|
@@ -112,7 +111,6 @@ export class MenuService {
|
|
|
112
111
|
}
|
|
113
112
|
nodoBase.listaTareas.push(unaTarea);
|
|
114
113
|
}
|
|
115
|
-
console.log(this._menu);
|
|
116
114
|
let respuesta = this.convertToMenuItems(arbolTareas);
|
|
117
115
|
respuesta.forEach(dato => {
|
|
118
116
|
const modulo = dato.tabindex;
|
|
@@ -125,7 +123,7 @@ export class MenuService {
|
|
|
125
123
|
return tareas.map(tarea => {
|
|
126
124
|
const menuItem = {
|
|
127
125
|
label: tarea.descripcion,
|
|
128
|
-
icon: tarea.gif,
|
|
126
|
+
icon: tarea.gif ? 'glyphicons ' + tarea.gif : undefined,
|
|
129
127
|
routerLink: tarea.urlprincipal,
|
|
130
128
|
tabindex: tarea.modulo,
|
|
131
129
|
items: tarea.listaTareas ? this.convertToMenuItems(tarea.listaTareas) : undefined
|
|
@@ -134,7 +132,6 @@ export class MenuService {
|
|
|
134
132
|
});
|
|
135
133
|
}
|
|
136
134
|
setTareasDelModulo(modulo) {
|
|
137
|
-
console.log('setTareasDelModulo');
|
|
138
135
|
this._menuSource.next(this._menu[modulo]);
|
|
139
136
|
}
|
|
140
137
|
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.0.4", ngImport: i0, type: MenuService, deps: [{ token: i1.StorageService }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
@@ -146,4 +143,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.0.4", ngImpor
|
|
|
146
143
|
providedIn: 'root',
|
|
147
144
|
}]
|
|
148
145
|
}], ctorParameters: () => [{ type: i1.StorageService }] });
|
|
149
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"menu.service.js","sourceRoot":"","sources":["../../../../../../src/app/core/servicios/menu.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\nimport { MenuItem } from 'primeng/api/menuitem';\nimport { map, Observable, of, ReplaySubject, Subject } from 'rxjs';\nimport { StorageService } from './storage.service';\n\n@Injectable({\n  providedIn: 'root',\n})\nexport class MenuService {\n  private _menu: { [key: string]: MenuItem } = {};\n  private _menuSource = new Subject<MenuItem>();\n  private _breadcrumbSource = new Subject<MenuItem[]>();\n  private _menuObservable$ = this._menuSource.asObservable();\n  private _breadcrumbObservable$ = this._breadcrumbSource.asObservable();\n\n  constructor(private storageService: StorageService) {}\n\n  /**\n   * Observable para los eventos del breadcrumb\n   */\n  get breadcrumb() {\n    return this._breadcrumbObservable$;\n  }\n\n  /**\n   * Observable para el menu principal\n   */\n  get menu() {\n    return this._menuObservable$;\n  }\n\n  /**\n   * Agrega items al breadcrumb\n   * @param items\n   */\n  setBreadcrumb(items: MenuItem[]): void {\n    this._breadcrumbSource.next(items);\n  }\n\n  /**\n   * Consulta la lista de tareas del usuario para cargar el menú\n   * @returns\n   */\n  loadTareas(): Observable<void> {\n    console.log('entra loadTareas menuservice')\n    /********************************************************/\n    /* Se debe cambiar con el request al servicio de tareas */\n    this._menu = {}\n    return of(JSON.parse(this.storageService.getItem('__tareas'))).pipe(\n      map((tareas: any[]) => {\n        const arbolTareas: any[] = [];\n\n     let nodoBase = null;\n     let nodoHijo = null;\n   \n     for (const unaTarea of tareas) {\n      const modulo = unaTarea.modulo+'';\n        if (!(modulo in this._menu)) {\n          this._menu[modulo] = { label: unaTarea.nombreModulo, items: [] };\n        }\n       if (!unaTarea.nombrePadre) {\n         arbolTareas.push(unaTarea);\n         continue;\n       }\n   \n       nodoBase = null;\n   \n       // Buscar en el primer nivel\n       for (const unNodo of arbolTareas) {\n         if (unNodo.tipo !== \"M\") {\n           continue;\n         }\n         if (unaTarea.nombreAbuelo && unNodo.descripcion === unaTarea.nombreAbuelo) {\n           // Buscar en el segundo nivel\n           for (const unNodo2 of unNodo.listaTareas || []) {\n             if (unNodo2.tipo !== \"M\") {\n               continue;\n             }\n             if (unNodo2.descripcion === unaTarea.nombrePadre) {\n               nodoBase = unNodo2;\n               break;\n             }\n           }\n           if (!nodoBase) {\n             nodoHijo = {\n               descripcion: unaTarea.nombrePadre,\n               gif: unaTarea.gifPadre,\n               tipo: \"M\",\n               listaTareas: [],\n               modulo: unaTarea.modulo,\n             };\n             unNodo.listaTareas!.push(nodoHijo);\n             nodoBase = nodoHijo;\n           }\n           break;\n         }\n         if (unNodo.descripcion === unaTarea.nombrePadre) {\n           nodoBase = unNodo;\n           break;\n         }\n       }\n   \n       if (!nodoBase) {\n         nodoBase = {\n           descripcion: unaTarea.nombreAbuelo || unaTarea.nombrePadre,\n           gif: unaTarea.nombreAbuelo ? unaTarea.gifAbuelo : unaTarea.gifPadre,\n           orden: unaTarea.nombreAbuelo ? unaTarea.ordenAbuelo : unaTarea.ordenPadre,\n           tipo: \"M\",\n           listaTareas: [],\n           modulo: unaTarea.modulo,\n         };\n         arbolTareas.push(nodoBase);\n   \n         if (unaTarea.nombreAbuelo) {\n           nodoHijo = {\n             descripcion: unaTarea.nombrePadre,\n             gif: unaTarea.gifPadre,\n             tipo: \"M\",\n             listaTareas: [], \n             modulo: unaTarea.modulo,\n           };\n           nodoBase.listaTareas!.push(nodoHijo);\n           nodoBase = nodoHijo;\n         }\n       }\n       nodoBase.listaTareas!.push(unaTarea);\n     }\n     console.log(this._menu)\n\n     let respuesta = this.convertToMenuItems(arbolTareas);\n     respuesta.forEach(dato => {\n      const modulo = dato.tabindex;\n      this._menu[modulo].items.push(dato);\n     }) \n      })\n    );\n    /********************************************************/\n  }\n\n  convertToMenuItems(tareas: any[]): MenuItem[] {\n    return tareas.map(tarea => {\n      const menuItem: MenuItem = {\n        label: tarea.descripcion,\n        icon: tarea.gif,\n        routerLink: tarea.urlprincipal,\n        tabindex: tarea.modulo,\n        items: tarea.listaTareas ? this.convertToMenuItems(tarea.listaTareas) : undefined\n      };\n      return menuItem;\n    });\n  }\n\n  setTareasDelModulo(modulo: string): void {\n    console.log ('setTareasDelModulo')\n    this._menuSource.next(this._menu[modulo]);\n  }\n}\n"]}
|
|
146
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"menu.service.js","sourceRoot":"","sources":["../../../../../../src/app/core/servicios/menu.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Injectable } from '@angular/core';\nimport { MenuItem } from 'primeng/api/menuitem';\nimport { map, Observable, of, ReplaySubject, Subject } from 'rxjs';\nimport { StorageService } from './storage.service';\n\n@Injectable({\n  providedIn: 'root',\n})\nexport class MenuService {\n  private _menu: { [key: string]: MenuItem } = {};\n  private _menuSource = new Subject<MenuItem>();\n  private _breadcrumbSource = new Subject<MenuItem[]>();\n  private _menuObservable$ = this._menuSource.asObservable();\n  private _breadcrumbObservable$ = this._breadcrumbSource.asObservable();\n\n  constructor(private storageService: StorageService) {}\n\n  /**\n   * Observable para los eventos del breadcrumb\n   */\n  get breadcrumb() {\n    return this._breadcrumbObservable$;\n  }\n\n  /**\n   * Observable para el menu principal\n   */\n  get menu() {\n    return this._menuObservable$;\n  }\n\n  /**\n   * Agrega items al breadcrumb\n   * @param items\n   */\n  setBreadcrumb(items: MenuItem[]): void {\n    this._breadcrumbSource.next(items);\n  }\n\n  /**\n   * Consulta la lista de tareas del usuario para cargar el menú\n   * @returns\n   */\n  loadTareas(): Observable<void> {\n    /********************************************************/\n    /* Se debe cambiar con el request al servicio de tareas */\n    this._menu = {}\n    return of(JSON.parse(this.storageService.getItem('__tareas'))).pipe(\n      map((tareas: any[]) => {\n        const arbolTareas: any[] = [];\n\n     let nodoBase = null;\n     let nodoHijo = null;\n   \n     for (const unaTarea of tareas) {\n      const modulo = unaTarea.modulo+'';\n        if (!(modulo in this._menu)) {\n          this._menu[modulo] = { label: unaTarea.nombreModulo, items: [] };\n        }\n       if (!unaTarea.nombrePadre) {\n         arbolTareas.push(unaTarea);\n         continue;\n       }\n   \n       nodoBase = null;\n   \n       // Buscar en el primer nivel\n       for (const unNodo of arbolTareas) {\n        if (unNodo.tipo !== \"M\") {\n          continue;\n        }\n        if (unaTarea.nombreAbuelo && unNodo.descripcion === unaTarea.nombreAbuelo && unNodo.modulo === unaTarea.modulo) {\n          // Buscar en el segundo nivel\n          for (const unNodo2 of unNodo.listaTareas || []) {\n            if (unNodo2.tipo !== \"M\") {\n              continue;\n            }\n            if (unNodo2.descripcion === unaTarea.nombrePadre && unNodo2.modulo === unaTarea.modulo)  {\n              nodoBase = unNodo2;\n              break;\n            }\n          }\n          if (!nodoBase) {\n            nodoHijo = {\n              descripcion: unaTarea.nombrePadre,\n              gif: unaTarea.gifPadre,\n              tipo: \"M\",\n              listaTareas: [],\n              modulo: unaTarea.modulo,\n            };\n            unNodo.listaTareas!.push(nodoHijo);\n            nodoBase = nodoHijo;\n          }\n          break;\n        }\n        if (unNodo.descripcion === unaTarea.nombrePadre && unNodo.modulo === unaTarea.modulo) {\n          nodoBase = unNodo;\n          break;\n        }\n      }\n  \n      if (!nodoBase) {\n        nodoBase = {\n          descripcion: unaTarea.nombreAbuelo || unaTarea.nombrePadre,\n          gif: unaTarea.nombreAbuelo ? unaTarea.gifAbuelo : unaTarea.gifPadre,\n          orden: unaTarea.nombreAbuelo ? unaTarea.ordenAbuelo : unaTarea.ordenPadre,\n          tipo: \"M\",\n          listaTareas: [],\n          modulo: unaTarea.modulo,\n        };\n        arbolTareas.push(nodoBase);\n  \n        if (unaTarea.nombreAbuelo) {\n          nodoHijo = {\n            descripcion: unaTarea.nombrePadre,\n            gif: unaTarea.gifPadre,\n            tipo: \"M\",\n            listaTareas: [], \n            modulo: unaTarea.modulo,\n          };\n          nodoBase.listaTareas!.push(nodoHijo);\n          nodoBase = nodoHijo;\n        }\n      }\n      nodoBase.listaTareas!.push(unaTarea);\n    }\n     let respuesta = this.convertToMenuItems(arbolTareas);\n     respuesta.forEach(dato => {\n      const modulo = dato.tabindex;\n      this._menu[modulo].items.push(dato);\n     }) \n      })\n    );\n    /********************************************************/\n  }\n\n  convertToMenuItems(tareas: any[]): MenuItem[] {\n    return tareas.map(tarea => {\n      const menuItem: MenuItem = {\n        label: tarea.descripcion,\n        icon: tarea.gif ? 'glyphicons ' + tarea.gif : undefined,\n        routerLink: tarea.urlprincipal,\n        tabindex: tarea.modulo,\n        items: tarea.listaTareas ? this.convertToMenuItems(tarea.listaTareas) : undefined\n      };\n      return menuItem;\n    });\n  }\n\n  setTareasDelModulo(modulo: string): void {\n    this._menuSource.next(this._menu[modulo]);\n  }\n}\n"]}
|
|
@@ -2115,7 +2115,6 @@ let MenuService$1 = class MenuService {
|
|
|
2115
2115
|
* @returns
|
|
2116
2116
|
*/
|
|
2117
2117
|
loadTareas() {
|
|
2118
|
-
console.log('entra loadTareas menuservice');
|
|
2119
2118
|
/********************************************************/
|
|
2120
2119
|
/* Se debe cambiar con el request al servicio de tareas */
|
|
2121
2120
|
this._menu = {};
|
|
@@ -2138,13 +2137,13 @@ let MenuService$1 = class MenuService {
|
|
|
2138
2137
|
if (unNodo.tipo !== "M") {
|
|
2139
2138
|
continue;
|
|
2140
2139
|
}
|
|
2141
|
-
if (unaTarea.nombreAbuelo && unNodo.descripcion === unaTarea.nombreAbuelo) {
|
|
2140
|
+
if (unaTarea.nombreAbuelo && unNodo.descripcion === unaTarea.nombreAbuelo && unNodo.modulo === unaTarea.modulo) {
|
|
2142
2141
|
// Buscar en el segundo nivel
|
|
2143
2142
|
for (const unNodo2 of unNodo.listaTareas || []) {
|
|
2144
2143
|
if (unNodo2.tipo !== "M") {
|
|
2145
2144
|
continue;
|
|
2146
2145
|
}
|
|
2147
|
-
if (unNodo2.descripcion === unaTarea.nombrePadre) {
|
|
2146
|
+
if (unNodo2.descripcion === unaTarea.nombrePadre && unNodo2.modulo === unaTarea.modulo) {
|
|
2148
2147
|
nodoBase = unNodo2;
|
|
2149
2148
|
break;
|
|
2150
2149
|
}
|
|
@@ -2162,7 +2161,7 @@ let MenuService$1 = class MenuService {
|
|
|
2162
2161
|
}
|
|
2163
2162
|
break;
|
|
2164
2163
|
}
|
|
2165
|
-
if (unNodo.descripcion === unaTarea.nombrePadre) {
|
|
2164
|
+
if (unNodo.descripcion === unaTarea.nombrePadre && unNodo.modulo === unaTarea.modulo) {
|
|
2166
2165
|
nodoBase = unNodo;
|
|
2167
2166
|
break;
|
|
2168
2167
|
}
|
|
@@ -2191,7 +2190,6 @@ let MenuService$1 = class MenuService {
|
|
|
2191
2190
|
}
|
|
2192
2191
|
nodoBase.listaTareas.push(unaTarea);
|
|
2193
2192
|
}
|
|
2194
|
-
console.log(this._menu);
|
|
2195
2193
|
let respuesta = this.convertToMenuItems(arbolTareas);
|
|
2196
2194
|
respuesta.forEach(dato => {
|
|
2197
2195
|
const modulo = dato.tabindex;
|
|
@@ -2204,7 +2202,7 @@ let MenuService$1 = class MenuService {
|
|
|
2204
2202
|
return tareas.map(tarea => {
|
|
2205
2203
|
const menuItem = {
|
|
2206
2204
|
label: tarea.descripcion,
|
|
2207
|
-
icon: tarea.gif,
|
|
2205
|
+
icon: tarea.gif ? 'glyphicons ' + tarea.gif : undefined,
|
|
2208
2206
|
routerLink: tarea.urlprincipal,
|
|
2209
2207
|
tabindex: tarea.modulo,
|
|
2210
2208
|
items: tarea.listaTareas ? this.convertToMenuItems(tarea.listaTareas) : undefined
|
|
@@ -2213,7 +2211,6 @@ let MenuService$1 = class MenuService {
|
|
|
2213
2211
|
});
|
|
2214
2212
|
}
|
|
2215
2213
|
setTareasDelModulo(modulo) {
|
|
2216
|
-
console.log('setTareasDelModulo');
|
|
2217
2214
|
this._menuSource.next(this._menu[modulo]);
|
|
2218
2215
|
}
|
|
2219
2216
|
static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.0.4", ngImport: i0, type: MenuService, deps: [{ token: StorageService }], target: i0.ɵɵFactoryTarget.Injectable });
|