From e365846029cdf831638a6ff3bf7a62cf4e86484f Mon Sep 17 00:00:00 2001
From: Mariano Andres Botta <marianoabotta@gmail.com>
Date: Thu, 1 Oct 2020 10:36:38 -0300
Subject: [PATCH] fix(rup): ajustes post rebase

---
 src/app/modules/rup/components/core/rup.html  |  8 +++--
 .../elementos/moleculaBase.component.ts       | 29 ++++++++++---------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/app/modules/rup/components/core/rup.html b/src/app/modules/rup/components/core/rup.html
index 13fcd2f0c0..1919609781 100644
--- a/src/app/modules/rup/components/core/rup.html
+++ b/src/app/modules/rup/components/core/rup.html
@@ -1,8 +1,10 @@
-<div *ngIf="(ultimaConsulta?.updatedAt || ultimaConsulta?.createdAt) && validacion === false" class="row bg-faded"
+<div *ngIf="(ultimaConsulta?.updatedAt || ultimaConsulta?.createdAt) && !validacion" class="row bg-faded"
      class="d-flex justify-content-start">
     <div class="col m-0 p-0 bg-registro-anterior">
-        <span>Registros tomados el {{ (ultimaConsulta.updatedAt || ultimaConsulta.createdAt) | fecha }}, por {{ ultimaConsulta.createdBy
-            | nombre }}</span>
+        <span>
+            Registros tomados el {{ (ultimaConsulta.updatedAt || ultimaConsulta.createdAt) | fecha }},
+            por
+            {{ ultimaConsulta.createdBy | nombre }}</span>
     </div>
 </div>
 
diff --git a/src/app/modules/rup/components/elementos/moleculaBase.component.ts b/src/app/modules/rup/components/elementos/moleculaBase.component.ts
index cfd3affc39..6ef239ce0b 100644
--- a/src/app/modules/rup/components/elementos/moleculaBase.component.ts
+++ b/src/app/modules/rup/components/elementos/moleculaBase.component.ts
@@ -8,7 +8,7 @@ import { RupElement } from '.';
 })
 @RupElement('MoleculaBaseComponent')
 export class MoleculaBaseComponent extends RUPComponent implements OnInit {
-    flag = true;
+    flag = false;
     ultimaConsulta;
     validacion = false;
 
@@ -16,18 +16,19 @@ export class MoleculaBaseComponent extends RUPComponent implements OnInit {
         if (this.params && this.params.hasSections) {
             this.registro.hasSections = true;
         }
-        this.route.url.subscribe(urlParts => {
-            if (urlParts.length > 1) {
-                if (urlParts[1].path === 'validacion') {
-                    this.validacion = true;
-                }
-            } else {
-                this.validacion = false;
-            }
-        });
+        // this.route.url.subscribe(urlParts => {
+        //     if (urlParts.length > 1) {
+        //         if (urlParts[1].path === 'validacion') {
+        //             this.validacion = true;
+        //         }
+        //     } else {
+        //         this.validacion = false;
+        //     }
+        // });
+        this.validacion = !this.ejecucionService;
+
         const buscarAnterior = this.params && this.params.buscarAnterior;
         if (!this.validacion && !this.soloValores && buscarAnterior) {
-
             this.prestacionesService.getRegistrosHuds(this.paciente.id, this.registro.concepto.conceptId).subscribe(consulta => {
                 // ordeno por fecha desde lo mas actual hasta infinito
 
@@ -46,12 +47,12 @@ export class MoleculaBaseComponent extends RUPComponent implements OnInit {
 
                         this.ultimaConsulta = consulta[0].registro;
                         this.registro.registros = JSON.parse(JSON.stringify(this.ultimaConsulta.registros));
-
-
-
                     }
                 }
+                this.flag = true;
             });
+        } else {
+            this.flag = true;
         }