general-library-union 2.3.48 → 2.3.49

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.
@@ -41,43 +41,98 @@ export class MenuService {
41
41
  /* Se debe cambiar con el request al servicio de tareas */
42
42
  this._menu = {};
43
43
  return of(JSON.parse(this.storageService.getItem('__tareas'))).pipe(map((tareas) => {
44
- tareas.forEach((tarea) => {
45
- //const modulo = tarea.nombreModulo.trim();
46
- const modulo = tarea.modulo + '';
47
- if (modulo?.trim() == '4') {
48
- console.log(' entra modulo 4');
49
- console.log(tarea);
50
- }
44
+ const arbolTareas = [];
45
+ let nodoBase = null;
46
+ let nodoHijo = null;
47
+ for (const unaTarea of tareas) {
48
+ const modulo = unaTarea.modulo + '';
51
49
  if (!(modulo in this._menu)) {
52
- this._menu[modulo] = { label: tarea.nombreModulo, items: [] };
50
+ this._menu[modulo] = { label: unaTarea.nombreModulo, items: [] };
51
+ }
52
+ if (!unaTarea.nombrePadre) {
53
+ arbolTareas.push(unaTarea);
54
+ continue;
53
55
  }
54
- let item;
55
- const nombreMenu = tarea.nombreAbuelo ?? tarea.nombrePadre;
56
- item = this._menu[modulo].items.find((item) => item.label == nombreMenu);
57
- if (!item) {
58
- item = { label: tarea.nombrePadre, icon: 'glyphicons ' + tarea.gifPadre, items: [] };
59
- if (nombreMenu === tarea.nombreAbuelo) {
60
- this._menu[modulo].items.push({ label: nombreMenu, icon: 'glyphicons ' + tarea.gifPadre, items: [item] });
56
+ nodoBase = null;
57
+ // Buscar en el primer nivel
58
+ for (const unNodo of arbolTareas) {
59
+ if (unNodo.tipo !== "M") {
60
+ continue;
61
61
  }
62
- else {
63
- this._menu[modulo].items.push(item);
62
+ if (unaTarea.nombreAbuelo && unNodo.descripcion === unaTarea.nombreAbuelo) {
63
+ // Buscar en el segundo nivel
64
+ for (const unNodo2 of unNodo.listaTareas || []) {
65
+ if (unNodo2.tipo !== "M") {
66
+ continue;
67
+ }
68
+ if (unNodo2.descripcion === unaTarea.nombrePadre) {
69
+ nodoBase = unNodo2;
70
+ break;
71
+ }
72
+ }
73
+ if (!nodoBase) {
74
+ nodoHijo = {
75
+ descripcion: unaTarea.nombrePadre,
76
+ gif: unaTarea.gifPadre,
77
+ tipo: "M",
78
+ listaTareas: [],
79
+ modulo: unaTarea.modulo,
80
+ };
81
+ unNodo.listaTareas.push(nodoHijo);
82
+ nodoBase = nodoHijo;
83
+ }
84
+ break;
64
85
  }
65
- }
66
- else {
67
- if (nombreMenu === tarea.nombreAbuelo) {
68
- item = item.items.find((item) => item.label == tarea.nombreAbuelo);
86
+ if (unNodo.descripcion === unaTarea.nombrePadre) {
87
+ nodoBase = unNodo;
88
+ break;
69
89
  }
70
90
  }
71
- if (item) {
72
- if (item.items) {
73
- const link = tarea.urlprincipal.replace(/.jsf/, '');
74
- item.items.push({ label: tarea.descripcion, routerLink: link });
91
+ if (!nodoBase) {
92
+ nodoBase = {
93
+ descripcion: unaTarea.nombreAbuelo || unaTarea.nombrePadre,
94
+ gif: unaTarea.nombreAbuelo ? unaTarea.gifAbuelo : unaTarea.gifPadre,
95
+ orden: unaTarea.nombreAbuelo ? unaTarea.ordenAbuelo : unaTarea.ordenPadre,
96
+ tipo: "M",
97
+ listaTareas: [],
98
+ modulo: unaTarea.modulo,
99
+ };
100
+ arbolTareas.push(nodoBase);
101
+ if (unaTarea.nombreAbuelo) {
102
+ nodoHijo = {
103
+ descripcion: unaTarea.nombrePadre,
104
+ gif: unaTarea.gifPadre,
105
+ tipo: "M",
106
+ listaTareas: [],
107
+ modulo: unaTarea.modulo,
108
+ };
109
+ nodoBase.listaTareas.push(nodoHijo);
110
+ nodoBase = nodoHijo;
75
111
  }
76
112
  }
113
+ nodoBase.listaTareas.push(unaTarea);
114
+ }
115
+ console.log(this._menu);
116
+ let respuesta = this.convertToMenuItems(arbolTareas);
117
+ respuesta.forEach(dato => {
118
+ const modulo = dato.tabindex;
119
+ this._menu[modulo].items.push(dato);
77
120
  });
78
121
  }));
79
122
  /********************************************************/
80
123
  }
124
+ convertToMenuItems(tareas) {
125
+ return tareas.map(tarea => {
126
+ const menuItem = {
127
+ label: tarea.descripcion,
128
+ icon: tarea.gif,
129
+ routerLink: tarea.urlprincipal,
130
+ tabindex: tarea.modulo,
131
+ items: tarea.listaTareas ? this.convertToMenuItems(tarea.listaTareas) : undefined
132
+ };
133
+ return menuItem;
134
+ });
135
+ }
81
136
  setTareasDelModulo(modulo) {
82
137
  console.log('setTareasDelModulo');
83
138
  this._menuSource.next(this._menu[modulo]);
@@ -91,4 +146,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "18.0.4", ngImpor
91
146
  providedIn: 'root',
92
147
  }]
93
148
  }], ctorParameters: () => [{ type: i1.StorageService }] });
94
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"menu.service.js","sourceRoot":"","sources":["../../../../../../src/app/core/servicios/menu.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C,OAAO,EAAE,GAAG,EAAc,EAAE,EAAiB,OAAO,EAAE,MAAM,MAAM,CAAC;;;AAMnE,MAAM,OAAO,WAAW;IAOF;IANZ,KAAK,GAAgC,EAAE,CAAC;IACxC,WAAW,GAAG,IAAI,OAAO,EAAY,CAAC;IACtC,iBAAiB,GAAG,IAAI,OAAO,EAAc,CAAC;IAC9C,gBAAgB,GAAG,IAAI,CAAC,WAAW,CAAC,YAAY,EAAE,CAAC;IACnD,sBAAsB,GAAG,IAAI,CAAC,iBAAiB,CAAC,YAAY,EAAE,CAAC;IAEvE,YAAoB,cAA8B;QAA9B,mBAAc,GAAd,cAAc,CAAgB;IAAG,CAAC;IAEtD;;OAEG;IACH,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,sBAAsB,CAAC;IACrC,CAAC;IAED;;OAEG;IACH,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IAED;;;OAGG;IACH,aAAa,CAAC,KAAiB;QAC7B,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACrC,CAAC;IAED;;;OAGG;IACH,UAAU;QACR,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAA;QAC3C,0DAA0D;QAC1D,0DAA0D;QAC1D,IAAI,CAAC,KAAK,GAAG,EAAE,CAAA;QACf,OAAO,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CACjE,GAAG,CAAC,CAAC,MAAa,EAAE,EAAE;YACpB,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;gBACvB,2CAA2C;gBAC3C,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,GAAC,EAAE,CAAC;gBAC/B,IAAI,MAAM,EAAE,IAAI,EAAE,IAAI,GAAG,EAAE,CAAC;oBAC1B,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAA;oBAC9B,OAAO,CAAC,GAAG,CAAE,KAAK,CAAC,CAAA;gBACrB,CAAC;gBACD,IAAI,CAAC,CAAC,MAAM,IAAI,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;oBAC5B,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,YAAY,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;gBAChE,CAAC;gBAED,IAAI,IAAc,CAAC;gBACnB,MAAM,UAAU,GAAG,KAAK,CAAC,YAAY,IAAI,KAAK,CAAC,WAAW,CAAC;gBAC3D,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,IAAI,UAAU,CAAC,CAAC;gBACzE,IAAI,CAAC,IAAI,EAAE,CAAC;oBACV,IAAI,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,WAAW,EAAE,IAAI,EAAE,aAAa,GAAG,KAAK,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;oBACrF,IAAI,UAAU,KAAK,KAAK,CAAC,YAAY,EAAE,CAAC;wBACtC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,aAAa,GAAG,KAAK,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;oBAC5G,CAAC;yBAAM,CAAC;wBACN,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBACtC,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,IAAI,UAAU,KAAK,KAAK,CAAC,YAAY,EAAE,CAAC;wBACtC,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;oBACrE,CAAC;gBACH,CAAC;gBAED,IAAI,IAAI,EAAC,CAAC;oBACR,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;wBACf,MAAM,IAAI,GAAG,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;wBACpD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,WAAW,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;oBAClE,CAAC;gBACH,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CACH,CAAC;QACF,0DAA0D;IAC5D,CAAC;IAED,kBAAkB,CAAC,MAAc;QAC/B,OAAO,CAAC,GAAG,CAAE,oBAAoB,CAAC,CAAA;QAClC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IAC5C,CAAC;uGApFU,WAAW;2GAAX,WAAW,cAFV,MAAM;;2FAEP,WAAW;kBAHvB,UAAU;mBAAC;oBACV,UAAU,EAAE,MAAM;iBACnB","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        tareas.forEach((tarea) => {\n          //const modulo = tarea.nombreModulo.trim();\n          const modulo = tarea.modulo+'';\n          if (modulo?.trim() == '4') {\n            console.log(' entra modulo 4')\n            console.log (tarea)\n          }\n          if (!(modulo in this._menu)) {\n            this._menu[modulo] = { label: tarea.nombreModulo, items: [] };\n          }\n\n          let item: MenuItem;\n          const nombreMenu = tarea.nombreAbuelo ?? tarea.nombrePadre;\n          item = this._menu[modulo].items.find((item) => item.label == nombreMenu);\n          if (!item) {\n            item = { label: tarea.nombrePadre, icon: 'glyphicons ' + tarea.gifPadre, items: [] };\n            if (nombreMenu === tarea.nombreAbuelo) {\n              this._menu[modulo].items.push({ label: nombreMenu, icon: 'glyphicons ' + tarea.gifPadre, items: [item] });\n            } else {\n              this._menu[modulo].items.push(item);\n            }\n          } else {\n            if (nombreMenu === tarea.nombreAbuelo) {\n              item = item.items.find((item) => item.label == tarea.nombreAbuelo);\n            }\n          }\n\n          if (item){\n            if (item.items) {\n              const link = tarea.urlprincipal.replace(/.jsf/, '');\n              item.items.push({ label: tarea.descripcion, routerLink: link });\n            }\n          }\n        });\n      })\n    );\n    /********************************************************/\n  }\n\n  setTareasDelModulo(modulo: string): void {\n    console.log ('setTareasDelModulo')\n    this._menuSource.next(this._menu[modulo]);\n  }\n}\n"]}
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"]}
@@ -2120,43 +2120,98 @@ let MenuService$1 = class MenuService {
2120
2120
  /* Se debe cambiar con el request al servicio de tareas */
2121
2121
  this._menu = {};
2122
2122
  return of(JSON.parse(this.storageService.getItem('__tareas'))).pipe(map((tareas) => {
2123
- tareas.forEach((tarea) => {
2124
- //const modulo = tarea.nombreModulo.trim();
2125
- const modulo = tarea.modulo + '';
2126
- if (modulo?.trim() == '4') {
2127
- console.log(' entra modulo 4');
2128
- console.log(tarea);
2129
- }
2123
+ const arbolTareas = [];
2124
+ let nodoBase = null;
2125
+ let nodoHijo = null;
2126
+ for (const unaTarea of tareas) {
2127
+ const modulo = unaTarea.modulo + '';
2130
2128
  if (!(modulo in this._menu)) {
2131
- this._menu[modulo] = { label: tarea.nombreModulo, items: [] };
2129
+ this._menu[modulo] = { label: unaTarea.nombreModulo, items: [] };
2130
+ }
2131
+ if (!unaTarea.nombrePadre) {
2132
+ arbolTareas.push(unaTarea);
2133
+ continue;
2132
2134
  }
2133
- let item;
2134
- const nombreMenu = tarea.nombreAbuelo ?? tarea.nombrePadre;
2135
- item = this._menu[modulo].items.find((item) => item.label == nombreMenu);
2136
- if (!item) {
2137
- item = { label: tarea.nombrePadre, icon: 'glyphicons ' + tarea.gifPadre, items: [] };
2138
- if (nombreMenu === tarea.nombreAbuelo) {
2139
- this._menu[modulo].items.push({ label: nombreMenu, icon: 'glyphicons ' + tarea.gifPadre, items: [item] });
2135
+ nodoBase = null;
2136
+ // Buscar en el primer nivel
2137
+ for (const unNodo of arbolTareas) {
2138
+ if (unNodo.tipo !== "M") {
2139
+ continue;
2140
2140
  }
2141
- else {
2142
- this._menu[modulo].items.push(item);
2141
+ if (unaTarea.nombreAbuelo && unNodo.descripcion === unaTarea.nombreAbuelo) {
2142
+ // Buscar en el segundo nivel
2143
+ for (const unNodo2 of unNodo.listaTareas || []) {
2144
+ if (unNodo2.tipo !== "M") {
2145
+ continue;
2146
+ }
2147
+ if (unNodo2.descripcion === unaTarea.nombrePadre) {
2148
+ nodoBase = unNodo2;
2149
+ break;
2150
+ }
2151
+ }
2152
+ if (!nodoBase) {
2153
+ nodoHijo = {
2154
+ descripcion: unaTarea.nombrePadre,
2155
+ gif: unaTarea.gifPadre,
2156
+ tipo: "M",
2157
+ listaTareas: [],
2158
+ modulo: unaTarea.modulo,
2159
+ };
2160
+ unNodo.listaTareas.push(nodoHijo);
2161
+ nodoBase = nodoHijo;
2162
+ }
2163
+ break;
2143
2164
  }
2144
- }
2145
- else {
2146
- if (nombreMenu === tarea.nombreAbuelo) {
2147
- item = item.items.find((item) => item.label == tarea.nombreAbuelo);
2165
+ if (unNodo.descripcion === unaTarea.nombrePadre) {
2166
+ nodoBase = unNodo;
2167
+ break;
2148
2168
  }
2149
2169
  }
2150
- if (item) {
2151
- if (item.items) {
2152
- const link = tarea.urlprincipal.replace(/.jsf/, '');
2153
- item.items.push({ label: tarea.descripcion, routerLink: link });
2170
+ if (!nodoBase) {
2171
+ nodoBase = {
2172
+ descripcion: unaTarea.nombreAbuelo || unaTarea.nombrePadre,
2173
+ gif: unaTarea.nombreAbuelo ? unaTarea.gifAbuelo : unaTarea.gifPadre,
2174
+ orden: unaTarea.nombreAbuelo ? unaTarea.ordenAbuelo : unaTarea.ordenPadre,
2175
+ tipo: "M",
2176
+ listaTareas: [],
2177
+ modulo: unaTarea.modulo,
2178
+ };
2179
+ arbolTareas.push(nodoBase);
2180
+ if (unaTarea.nombreAbuelo) {
2181
+ nodoHijo = {
2182
+ descripcion: unaTarea.nombrePadre,
2183
+ gif: unaTarea.gifPadre,
2184
+ tipo: "M",
2185
+ listaTareas: [],
2186
+ modulo: unaTarea.modulo,
2187
+ };
2188
+ nodoBase.listaTareas.push(nodoHijo);
2189
+ nodoBase = nodoHijo;
2154
2190
  }
2155
2191
  }
2192
+ nodoBase.listaTareas.push(unaTarea);
2193
+ }
2194
+ console.log(this._menu);
2195
+ let respuesta = this.convertToMenuItems(arbolTareas);
2196
+ respuesta.forEach(dato => {
2197
+ const modulo = dato.tabindex;
2198
+ this._menu[modulo].items.push(dato);
2156
2199
  });
2157
2200
  }));
2158
2201
  /********************************************************/
2159
2202
  }
2203
+ convertToMenuItems(tareas) {
2204
+ return tareas.map(tarea => {
2205
+ const menuItem = {
2206
+ label: tarea.descripcion,
2207
+ icon: tarea.gif,
2208
+ routerLink: tarea.urlprincipal,
2209
+ tabindex: tarea.modulo,
2210
+ items: tarea.listaTareas ? this.convertToMenuItems(tarea.listaTareas) : undefined
2211
+ };
2212
+ return menuItem;
2213
+ });
2214
+ }
2160
2215
  setTareasDelModulo(modulo) {
2161
2216
  console.log('setTareasDelModulo');
2162
2217
  this._menuSource.next(this._menu[modulo]);