revision

src/app/components/rates/rates.component.html

@@ -235,11 +235,11 @@
               name="sel3"
             >
               <option
-                *ngFor="let item of listAssets"
-                [selected]="item.id === assetID"
-                [value]="item.id"
+                *ngFor="let item of distribuidoras"
+                [selected]="item.codigo === distribuidoraSel"
+                [value]="item.codigo"
               >
-                {{ userLevel == 0 ? "PLANTA INVERLEC" : item.name }}</option
+                {{ item.nombre }}</option
               >
             </select>
           </div>
@@ -256,11 +256,11 @@
               name="sel3"
             >
               <option
-                *ngFor="let item of listAssets"
-                [selected]="item.id === assetID"
-                [value]="item.id"
+                *ngFor="let item of tarifas"
+                [selected]="item.codigo === tarifaSel"
+                [value]="item.codigo"
               >
-                {{ userLevel == 0 ? "PLANTA INVERLEC" : item.name }}</option
+                {{ item.nombre }}</option
               >
             </select>
           </div>

src/app/components/rates/rates.component.ts

@@ -14,6 +14,7 @@ import { formatDate, DatePipe } from "@angular/common";
 import * as moment from "moment";
 import Swal from "sweetalert2";
 import { RatesService } from "@app/services/rates.service";
+import { CatalogsService } from "@app/services/catalogs.service";
 
 @Component({
   selector: "app-rates",
@@ -109,6 +110,8 @@ export class RatesComponent implements OnInit {
   @ViewChild("baseChart", null) chart: BaseChartDirective;
   metersData: any[];
   metersValues: unknown[];
+  distribuidoras: any;
+  tarifas: any;
 
   constructor(
     private plantsService: PlantsService,
@@ -117,7 +120,8 @@ export class RatesComponent implements OnInit {
     private router: Router,
     private zone: NgZone,
     private authService: AuthService,
-    private ratesService: RatesService
+    private ratesService: RatesService,
+    private catalogService: CatalogsService
   ) {
     //DEMO
     this.userLevel = +this.authService.getUserLevel();
@@ -136,18 +140,21 @@ export class RatesComponent implements OnInit {
     }, 3000);
 
     this.ratesService.getDefaultRate().subscribe((res) => {
-      console.log("tarifa");
-      console.log(res);
       this.rates = res["data"];
     });
 
+    this.catalogService.getCatalogByName("distribuidoras").subscribe((res) => {
+      this.distribuidoras = res["data"]["catalogo"]["records"];
+    });
+
+    this.catalogService.getCatalogByName("tarifas").subscribe((res) => {
+      this.tarifas = res["data"]["catalogo"]["records"];
+    });
+
     this.ratesService.getHistoricalRate().subscribe((res) => {
-      console.log("historico");
-      console.log(res);
       this.metersData = [];
       this.metersValues = Object.values(res["data"]["tarifas"]);
 
-      console.log(this.metersValues);
       let meterKeys2 = Object.keys(this.metersValues);
 
       let labels = [];
@@ -160,17 +167,6 @@ export class RatesComponent implements OnInit {
       let cargo_energia_valle = [];
 
       for (let prop in meterKeys2) {
-        console.log();
-        //let label = localStorage.getItem("email") == "inverlec@grupomerelec.com" ? `INVERLEC ${prop}` : this.metersValues[prop]["label"];
-
-        //label = this.metersValues["dateMin"] + "-" + this.metersValues["dateMax"] ;
-        /*
-        let measure_values = Object.values(
-          this.metersValues[prop]["data"]
-            .map((obj) => obj.total_energy_kWh)
-            .reverse()
-        );*/
-
         labels.push(
           `${this.metersValues[prop]["dateMin"]} - ${this.metersValues[prop]["dateMax"]}`
         );
@@ -269,23 +265,6 @@ export class RatesComponent implements OnInit {
         });
       }
 
-      /*
-      cargo_energia_punta
-cargo_energia_resto
-cargo_energia_valle
-
-      this.metersValues[0]["data"]
-                  .map((obj) =>
-                    formatDate(
-                      obj.dateMin.replace(/-/g, "/").replace("T", " "),
-                      "HH:mm ",
-                      "es-Es",
-                      "-0600"
-                    )
-                  )
-                  .reverse();
-      */
-
       this.barChartOptions = {
         title: {
           display: true,
@@ -344,4 +323,6 @@ cargo_energia_valle
   }
 
   ngOnChanges(): void {}
+
+  onChangeObj() {}
 }