Merge branch 'master' of http://209.50.56.224/ITTEC/SistemaMantenimiento

sistema-mantenimiento-front/src/app/app.module.ts

@@ -95,7 +95,6 @@ import { Plantilla3Component } from './components/test/plantilla3/plantilla3.com
     GETBComponent,
     GETBGMComponent,
     GETBSBComponent,
-    GETBMEComponent,
     GETBFOComponent,
     GETBREComponent,
     AlertComponent,
@@ -116,7 +115,8 @@ import { Plantilla3Component } from './components/test/plantilla3/plantilla3.com
     GetbsbConsultarModulosComponent,
     GetbreFormComponent,
     GetbreConsultarTablasComponent,
-
+    GETBMEComponent,
+    GetbmeFormComponent,
     Plantilla1Component,
     Plantilla2Component,
     Plantilla3Component,

sistema-mantenimiento-front/src/app/components/getb/getbfo/getbfo-form/getbfo-form.component.ts

@@ -49,13 +49,10 @@ export class GETBFOFORMComponent implements OnInit {
     return arrModule;
   }
 
-<<<<<<< HEAD
   //Obtener submódulo por módulo
   public async dataSubmodule() {
     await lastValueFrom(
-      this._submoduloService.getSubmodules(
-        this.modulo_data?.value.CODIGO_MODULO
-      )
+      this._submoduloService.getOneSubmodule(this.modulo_data?.value.CODIGO_MODULO)
     ).then(
       (data: ResponseData) => {
         if (!data.error) {
@@ -65,16 +62,6 @@ export class GETBFOFORMComponent implements OnInit {
           } else {
             this.submodulo_data?.disable();
           }
-=======
-  public async dataSubmodule() {    
-    await lastValueFrom(this._submoduloService.getOneSubmodule(this.modulo?.value.CODIGO_MODULO)).then((data:ResponseData) => {
-      if(!data.error){
-        if (data.response.length > 0) {
-          this.submodulo_data?.enable();
-          this.submodulo = this.filterSubmodule(data.response);
-        }else{
-          this.submodulo_data?.disable();
->>>>>>> 506f47802b84c3e35051a6e79ecb75b72aed79d1
         }
       },
       (error) => {
@@ -86,7 +73,7 @@ export class GETBFOFORMComponent implements OnInit {
   //Obtener menú por submódulo
   public async dataMenu() {
     await lastValueFrom(
-      this._menuService.getMenuBySubmodulo(
+      this._menuService.getOneMenu(
         this.submodulo_data?.value.CODIGO_SUBMODULO
       )
     ).then(