From ece306d2c2879276d73afa047a790536ba1f17a2 Mon Sep 17 00:00:00 2001
From: Marcelo Puebla <mpuebla@focasoftware.com>
Date: Fri, 14 Feb 2020 11:05:35 -0300
Subject: [PATCH] Add Logica para validad fechas

---
 .../filtro-categorias/filtro-categorias.component.ts           |  9 +++------
 .../seleccion-articulos/seleccion-articulos.component.html     |  1 +
 .../seleccion-articulos/seleccion-articulos.component.ts       |  6 ++++++
 src/app/utils/dateExtension.ts                                 | 10 ++++++++++
 4 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 src/app/utils/dateExtension.ts

diff --git a/src/app/modules/seleccion-articulos/filtro-categorias/filtro-categorias.component.ts b/src/app/modules/seleccion-articulos/filtro-categorias/filtro-categorias.component.ts
index d45f043..eabed4a 100644
--- a/src/app/modules/seleccion-articulos/filtro-categorias/filtro-categorias.component.ts
+++ b/src/app/modules/seleccion-articulos/filtro-categorias/filtro-categorias.component.ts
@@ -3,6 +3,7 @@ import { ICategoria } from 'src/app/interfaces/ICategoria';
 import { InactiveScreenService } from 'src/app/services/inactive-screen/inactive-screen.service';
 import { CategoriaService } from 'src/app/services/categoria/categoria.service';
 import { APP_SETTINGS } from 'src/etc/AppSettings';
+import { DateExtension } from 'src/app/utils/dateExtension';
 
 @Component({
   selector: 'app-filtro-categorias',
@@ -87,12 +88,8 @@ export class FiltroCategoriasComponent implements OnInit {
     }, 500);
   }
 
-  validarFecha(fechaInicioString: string, fechaFinString: string) {
-    const fechaInicio = new Date(fechaInicioString);
-    const fechaFin = new Date(fechaFinString);
-    const fechaAux = Date.now();
-    const fechaHoy = new Date(fechaAux);
-    return (fechaHoy >= fechaInicio && fechaHoy <= fechaFin) ? true : false;
+  validarFecha(fechaInicio: string, fechaFin: string) {
+    return DateExtension.ValidateDateRange(fechaInicio, fechaFin);
   }
 
   mediaPantalla() {
diff --git a/src/app/modules/seleccion-articulos/seleccion-articulos.component.html b/src/app/modules/seleccion-articulos/seleccion-articulos.component.html
index 5a88b80..67cc929 100644
--- a/src/app/modules/seleccion-articulos/seleccion-articulos.component.html
+++ b/src/app/modules/seleccion-articulos/seleccion-articulos.component.html
@@ -40,6 +40,7 @@
               <!-- ARTICULO -->
               <div
                 *ngFor="let articulo of auxArticulos | slice:0:showQuantity;"
+                [hidden]="validarFecha(articulo.FECHA_VIGENCIA_DESDE, articulo.FECHA_VIGENCIA_HASTA)"
                 class="col px-2 my-1 my-md-3 h-auto">
                 <div
                   class="swing-in-top-fwd btn-effect card h-auto"
diff --git a/src/app/modules/seleccion-articulos/seleccion-articulos.component.ts b/src/app/modules/seleccion-articulos/seleccion-articulos.component.ts
index 35739e0..1dbf677 100644
--- a/src/app/modules/seleccion-articulos/seleccion-articulos.component.ts
+++ b/src/app/modules/seleccion-articulos/seleccion-articulos.component.ts
@@ -13,6 +13,7 @@ import { FiltroCategoriasComponent } from './filtro-categorias/filtro-categorias
 import * as _ from 'lodash';
 import { ANIMATIONS } from 'src/app/utils/animations';
 import { NoStockComponent } from './no-stock/no-stock.component';
+import { DateExtension } from 'src/app/utils/dateExtension';
 
 @Component({
   selector: 'app-seleccion-articulos',
@@ -188,6 +189,11 @@ export class SeleccionArticulosComponent implements OnInit, AfterViewInit, OnDes
     this.showQuantity += 100;
   }
 
+
+  validarFecha(fechaInicio: string, fechaFin: string) {
+    return DateExtension.ValidateDateRange(fechaInicio, fechaFin);
+  }
+
   @HostListener('scroll', ['$event'])
   scrollEvent(event: Event) {
     clearTimeout(this.inactiveScreen.timerReposo);
diff --git a/src/app/utils/dateExtension.ts b/src/app/utils/dateExtension.ts
new file mode 100644
index 0000000..5e5e2ab
--- /dev/null
+++ b/src/app/utils/dateExtension.ts
@@ -0,0 +1,10 @@
+export class DateExtension {
+
+  public static ValidateDateRange(dateStart: string, dateEnd: string) {
+    if (dateEnd === null) return false;
+    const today = new Date(Date.now());
+    return (new Date(dateStart) <= today && today <= new Date(dateEnd))
+      ? true : false;
+  }
+
+}
\ No newline at end of file
-- 
1.9.1