ajustes para demo

src/app/components/assets/assets.component.ts

@@ -88,7 +88,17 @@ export class AssetsComponent implements OnInit {
 
     // Observable of two objects
     forkJoin([plants, energy_produced]).subscribe(results => {
-      this.listAssets = results[0]["assets"];
+      if (localStorage.getItem("email") == "inverlec@grupomerelec.com"){
+        this.listAssets = [{
+          name: "Inversiones MERELEC S.A de C.V",
+          id: 1
+        }]
+      }
+      else {
+
+        this.listAssets = results[0]["assets"];
+      }
+      
       this.listEnergyProduced = results[1];   
     },
     (err) => {
@@ -99,7 +109,7 @@ export class AssetsComponent implements OnInit {
       });
     });
 
-    setTimeout(()=>{
+    
       this.isActive = [false, false, true, false];
       this.logsService.getEnergyProducedByMonth().toPromise()
       .then((data: any) => {
@@ -115,7 +125,8 @@ export class AssetsComponent implements OnInit {
 
         // Json object construction for passing its values to the chartjs datasets according to its requirements
         for (let prop in meterKeys2) { 
-          this.metersData.push({"label": this.metersKeys[prop], backgroundColor: this.barChartColors[prop], data: this.metersValues[prop].map(obj => obj.total_energy_kWh).reverse()});
+          let label = localStorage.getItem("email") == "inverlec@grupomerelec.com" ? `INVERLEC ${prop}` : this.metersKeys[prop];
+          this.metersData.push({"label": label, backgroundColor: this.barChartColors[prop], data: this.metersValues[prop].map(obj => obj.total_energy_kWh).reverse()});
           this.barChartLabels = this.metersValues[prop].map(obj => formatDate(obj.dateMax, 'dd/MM','es-Es','-0600')).reverse();
         }
 
@@ -167,8 +178,9 @@ export class AssetsComponent implements OnInit {
         this.chartjs = true;
       });
       this.chartjs = true;
-      Swal.close();
-    }, 2000);
+      setTimeout(()=>{
+        Swal.close();
+      }, 2700);
 
   }
  
@@ -181,7 +193,11 @@ export class AssetsComponent implements OnInit {
     }
   }
 
-  private onMeasureClickDay(): void {
+  onChangeObj(event) {
+    
+  }
+
+  onMeasureClickDay(): void {
     console.log("DAY");
     Swal.fire({
       allowOutsideClick: false,
@@ -192,78 +208,80 @@ export class AssetsComponent implements OnInit {
     this.isActive = [true, false, false, false];
     this.chart1.destroy();
 
-    setTimeout(()=>{ 
-      this.logsService.getEnergyProducedByDay().toPromise()
-      .then((data: any) => {
-        // Get all the keys(each meter name) of the returned promise
-        this.metersKeys = Object.keys(data["1D"]);
-                
-        // Get all the values according to each index (meter) 
-        this.metersValues = Object.values(data["1D"]).map(sub => sub);
-        let meterKeys2 = Object.keys(this.metersValues);
-
-        // Re-Initialize Json object
-        this.metersData = [];
-
-        // Json object construction for passing its values to the chartjs datasets according to its requirements
-        for (let prop in meterKeys2) { 
-          this.metersData.push({"label": this.metersKeys[prop], backgroundColor: this.barChartColors[prop], data: this.metersValues[prop].map(obj => obj.total_energy_kWh).reverse()});
-          this.barChartLabels = this.metersValues[prop].map(obj => formatDate(obj.dateMin, 'hh:mm:ss','es-Es','-0600')).reverse();
-        }
-        this.chart1.destroy();
-        this.chart1 = undefined;
-        // Chart draw
-        this.chart1 = new Chart('canvas', {
-          type: 'bar',
-          options: {
-            title: {
-              display: true,
-            },
-            tooltips: {
-              mode: 'index',
-              callbacks: {
-                // Get the total of the energy produced in every point and show it in the hover tooltip
-                label: function (tooltipItem, data) { 
-                  var label = data.datasets[tooltipItem.datasetIndex].label || '';
-                  var value = data.datasets[tooltipItem.datasetIndex].data[tooltipItem.index];
-                  var total = 0;
-
-                  for (var i = 0; i < data.datasets.length; i++)
-                    total += +data.datasets[i].data[tooltipItem.index];
-
-                  if (tooltipItem.datasetIndex !== data.datasets.length - 1) {
-                    return label + " : " + value;
-                  }
-                  else {
-                    return [label + " : " + value, "TOTAL : " + Math.round(total)];
-                  }
+     
+    this.logsService.getEnergyProducedByDay().toPromise()
+    .then((data: any) => {
+      // Get all the keys(each meter name) of the returned promise
+      this.metersKeys = Object.keys(data["1D"]);
+              
+      // Get all the values according to each index (meter) 
+      this.metersValues = Object.values(data["1D"]).map(sub => sub);
+      let meterKeys2 = Object.keys(this.metersValues);
+
+      // Re-Initialize Json object
+      this.metersData = [];
+
+      // Json object construction for passing its values to the chartjs datasets according to its requirements
+      for (let prop in meterKeys2) { 
+        let label = localStorage.getItem("email") == "inverlec@grupomerelec.com" ? `INVERLEC ${prop}` : this.metersKeys[prop];
+        this.metersData.push({"label": label, backgroundColor: this.barChartColors[prop], data: this.metersValues[prop].map(obj => obj.total_energy_kWh).reverse()});
+        this.barChartLabels = this.metersValues[prop].map(obj => formatDate(obj.dateMin, 'hh:mm:ss','es-Es','-0600')).reverse();
+      }
+      this.chart1.destroy();
+      this.chart1 = undefined;
+      // Chart draw
+      this.chart1 = new Chart('canvas', {
+        type: 'bar',
+        options: {
+          title: {
+            display: true,
+          },
+          tooltips: {
+            mode: 'index',
+            callbacks: {
+              // Get the total of the energy produced in every point and show it in the hover tooltip
+              label: function (tooltipItem, data) { 
+                var label = data.datasets[tooltipItem.datasetIndex].label || '';
+                var value = data.datasets[tooltipItem.datasetIndex].data[tooltipItem.index];
+                var total = 0;
+
+                for (var i = 0; i < data.datasets.length; i++)
+                  total += +data.datasets[i].data[tooltipItem.index];
+
+                if (tooltipItem.datasetIndex !== data.datasets.length - 1) {
+                  return label + " : " + value;
+                }
+                else {
+                  return [label + " : " + value, "TOTAL : " + Math.round(total)];
                 }
               }
-            },
-            responsive: true,
-            maintainAspectRatio: false,
-            scales: {
-              xAxes: [{
-                stacked: true,
-              }],
-              yAxes: [{
-                stacked: true
-              }]
             }
           },
-          data: {
-            labels: this.barChartLabels,
-            datasets: 
-              this.metersData,
-          }, 
-        });
-        this.chartjs = true;
+          responsive: true,
+          maintainAspectRatio: false,
+          scales: {
+            xAxes: [{
+              stacked: true,
+            }],
+            yAxes: [{
+              stacked: true
+            }]
+          }
+        },
+        data: {
+          labels: this.barChartLabels,
+          datasets: 
+            this.metersData,
+        }, 
       });
+      this.chartjs = true;
+    });
+    setTimeout(()=>{
       Swal.close();
-    }, 2000);
+    }, 2700)
   }
 
-  private onMeasureClickWeek(): void {
+  onMeasureClickWeek(): void {
     console.log("WEEK");
 
     Swal.fire({
@@ -274,84 +292,81 @@ export class AssetsComponent implements OnInit {
     Swal.showLoading();
     this.isActive = [false, true, false, false];
     this.chart1.destroy();
-
-    setTimeout(()=>{ 
-      this.logsService.getEnergyProducedByWeek().toPromise()
-      .then((data: any) => {
-        // Get all the keys(each meter name) of the returned promise
-        this.metersKeys = Object.keys(data["7D"]);
-        
-        // Get all the values according to each index (meter) 
-        this.metersValues = Object.values(data["7D"]).map(sub => sub);
-        let meterKeys2 = Object.keys(this.metersValues);
-        
-        // Re-Initialize Json object
-        this.metersData = [];
-
-        // Json object construction for passing its values to the chartjs datasets according to its requirements
-        for (let prop in meterKeys2) { 
-          this.metersData.push({"label": this.metersKeys[prop], backgroundColor: this.barChartColors[prop], data: this.metersValues[prop].map(obj => obj.total_energy_kWh).reverse()});
-          this.barChartLabels = this.metersValues[prop].map(obj => formatDate(obj.dateMax, 'EEEE dd','es-Es','-0600')).reverse();
-        }
-        this.chart1.destroy();
-        this.chart1 = undefined;
-        // Chart draw
-        this.chart1 = new Chart('canvas', {
-          type: 'bar',
-          options: {
-            title: {
-              display: true,
-            },
-            tooltips: {
-              mode: 'index',
-              callbacks: {
-                // Get the total of the energy produced in every point and show it in the hover tooltip
-                label: function (tooltipItem, data) { 
-                  var label = data.datasets[tooltipItem.datasetIndex].label || '';
-                  var value = data.datasets[tooltipItem.datasetIndex].data[tooltipItem.index];
-                  var total = 0;
-
-                  for (var i = 0; i < data.datasets.length; i++)
-                    total += +data.datasets[i].data[tooltipItem.index];
-
-                  if (tooltipItem.datasetIndex !== data.datasets.length - 1) {
-                    return label + " : " + value;
-                  }
-                  else {
-                    return [label + " : " + value, "TOTAL : " + Math.round(total)];
-                  }
+ 
+    this.logsService.getEnergyProducedByWeek().toPromise()
+    .then((data: any) => {
+      // Get all the keys(each meter name) of the returned promise
+      this.metersKeys = Object.keys(data["7D"]);
+      
+      // Get all the values according to each index (meter) 
+      this.metersValues = Object.values(data["7D"]).map(sub => sub);
+      let meterKeys2 = Object.keys(this.metersValues);
+      
+      // Re-Initialize Json object
+      this.metersData = [];
+
+      // Json object construction for passing its values to the chartjs datasets according to its requirements
+      for (let prop in meterKeys2) { 
+        let label = localStorage.getItem("email") == "inverlec@grupomerelec.com" ? `INVERLEC ${prop}` : this.metersKeys[prop];
+        this.metersData.push({"label": label, backgroundColor: this.barChartColors[prop], data: this.metersValues[prop].map(obj => obj.total_energy_kWh).reverse()});
+        this.barChartLabels = this.metersValues[prop].map(obj => formatDate(obj.dateMax, 'EEEE dd','es-Es','-0600')).reverse();
+      }
+      this.chart1.destroy();
+      this.chart1 = undefined;
+      // Chart draw
+      this.chart1 = new Chart('canvas', {
+        type: 'bar',
+        options: {
+          title: {
+            display: true,
+          },
+          tooltips: {
+            mode: 'index',
+            callbacks: {
+              // Get the total of the energy produced in every point and show it in the hover tooltip
+              label: function (tooltipItem, data) { 
+                var label = data.datasets[tooltipItem.datasetIndex].label || '';
+                var value = data.datasets[tooltipItem.datasetIndex].data[tooltipItem.index];
+                var total = 0;
+
+                for (var i = 0; i < data.datasets.length; i++)
+                  total += +data.datasets[i].data[tooltipItem.index];
+
+                if (tooltipItem.datasetIndex !== data.datasets.length - 1) {
+                  return label + " : " + value;
+                }
+                else {
+                  return [label + " : " + value, "TOTAL : " + Math.round(total)];
                 }
               }
-            },
-            responsive: true,
-            maintainAspectRatio: false,
-            scales: {
-              xAxes: [{
-                stacked: true,
-              }],
-              yAxes: [{
-                stacked: true
-              }]
             }
           },
-          data: {
-            labels: this.barChartLabels,
-            datasets: 
-              this.metersData,
-          }, 
-        });
-        this.chartjs = true;
+          responsive: true,
+          maintainAspectRatio: false,
+          scales: {
+            xAxes: [{
+              stacked: true,
+            }],
+            yAxes: [{
+              stacked: true
+            }]
+          }
+        },
+        data: {
+          labels: this.barChartLabels,
+          datasets: 
+            this.metersData,
+        }, 
       });
       this.chartjs = true;
-      Swal.close();
-    }, 2000);
-
-
+    });
 
-   
+    setTimeout(()=>{
+      Swal.close();
+    }, 2700)   
   }
 
-  private onMeasureClickMonth(): void {
+  onMeasureClickMonth(): void {
     Swal.fire({
       allowOutsideClick: false,
       type: 'info',
@@ -360,81 +375,82 @@ export class AssetsComponent implements OnInit {
     Swal.showLoading();
     this.isActive = [false, false, true, false];
     this.chart1.destroy();
-
-    setTimeout(()=>{ 
-      this.logsService.getEnergyProducedByMonth().toPromise()
-      .then((data: any) => {
-        // Get all the keys(each meter name) of the returned promise
-        this.metersKeys = Object.keys(data["1M"]);
-        
-        // Get all the values according to each index (meter) 
-        this.metersValues = Object.values(data["1M"]).map(sub => sub);
-        let meterKeys2 = Object.keys(this.metersValues);
-        
-        // Re-Initialize Json object
-        this.metersData = [];
-
-        // Json object construction for passing its values to the chartjs datasets according to its requirements
-        for (let prop in meterKeys2) { 
-          this.metersData.push({"label": this.metersKeys[prop], backgroundColor: this.barChartColors[prop], data: this.metersValues[prop].map(obj => obj.total_energy_kWh).reverse()});
-          this.barChartLabels = this.metersValues[prop].map(obj => formatDate(obj.dateMax, 'dd/MM','es-Es','-0600')).reverse();
-        }
-        this.chart1.destroy();
-        this.chart1 = undefined;
-        // Chart draw
-        this.chart1 = new Chart('canvas', {
-          type: 'bar',
-          options: {
-            title: {
-              display: true,
-            },
-            tooltips: {
-              mode: 'index',
-              callbacks: {
-                // Get the total of the energy produced in every point and show it in the hover tooltip
-                label: function (tooltipItem, data) { 
-                  var label = data.datasets[tooltipItem.datasetIndex].label || '';
-                  var value = data.datasets[tooltipItem.datasetIndex].data[tooltipItem.index];
-                  var total = 0;
-
-                  for (var i = 0; i < data.datasets.length; i++)
-                    total += +data.datasets[i].data[tooltipItem.index];
-
-                  if (tooltipItem.datasetIndex !== data.datasets.length - 1) {
-                    return label + " : " + value;
-                  }
-                  else {
-                    return [label + " : " + value, "TOTAL : " + Math.round(total)];
-                  }
+     
+    this.logsService.getEnergyProducedByMonth().toPromise()
+    .then((data: any) => {
+      // Get all the keys(each meter name) of the returned promise
+      this.metersKeys = Object.keys(data["1M"]);
+      
+      // Get all the values according to each index (meter) 
+      this.metersValues = Object.values(data["1M"]).map(sub => sub);
+      let meterKeys2 = Object.keys(this.metersValues);
+      
+      // Re-Initialize Json object
+      this.metersData = [];
+
+      // Json object construction for passing its values to the chartjs datasets according to its requirements
+      for (let prop in meterKeys2) { 
+        let label = localStorage.getItem("email") == "inverlec@grupomerelec.com" ? `INVERLEC ${prop}` : this.metersKeys[prop];
+        this.metersData.push({"label": label, backgroundColor: this.barChartColors[prop], data: this.metersValues[prop].map(obj => obj.total_energy_kWh).reverse()});
+        this.barChartLabels = this.metersValues[prop].map(obj => formatDate(obj.dateMax, 'dd/MM','es-Es','-0600')).reverse();
+      }
+      this.chart1.destroy();
+      this.chart1 = undefined;
+      // Chart draw
+      this.chart1 = new Chart('canvas', {
+        type: 'bar',
+        options: {
+          title: {
+            display: true,
+          },
+          tooltips: {
+            mode: 'index',
+            callbacks: {
+              // Get the total of the energy produced in every point and show it in the hover tooltip
+              label: function (tooltipItem, data) { 
+                var label = data.datasets[tooltipItem.datasetIndex].label || '';
+                var value = data.datasets[tooltipItem.datasetIndex].data[tooltipItem.index];
+                var total = 0;
+
+                for (var i = 0; i < data.datasets.length; i++)
+                  total += +data.datasets[i].data[tooltipItem.index];
+
+                if (tooltipItem.datasetIndex !== data.datasets.length - 1) {
+                  return label + " : " + value;
+                }
+                else {
+                  return [label + " : " + value, "TOTAL : " + Math.round(total)];
                 }
               }
-            },
-            responsive: true,
-            maintainAspectRatio: false,
-            scales: {
-              xAxes: [{
-                stacked: true,
-              }],
-              yAxes: [{
-                stacked: true
-              }]
             }
           },
-          data: {
-            labels: this.barChartLabels,
-            datasets: 
-              this.metersData,
-          }, 
-        });
-        this.chartjs = true;
+          responsive: true,
+          maintainAspectRatio: false,
+          scales: {
+            xAxes: [{
+              stacked: true,
+            }],
+            yAxes: [{
+              stacked: true
+            }]
+          }
+        },
+        data: {
+          labels: this.barChartLabels,
+          datasets: 
+            this.metersData,
+        }, 
       });
       this.chartjs = true;
+    });
+
+    setTimeout(()=>{
       Swal.close();
-    }, 2000);
+    }, 2700)
 
   }
 
-  private onMeasureYear(): void {
+  onMeasureYear(): void {
 
     Swal.fire({
       allowOutsideClick: false,
@@ -446,76 +462,76 @@ export class AssetsComponent implements OnInit {
     this.isActive = [false, false, false, true];  
     this.chart1.destroy();
 
-    setTimeout(()=>{ 
-
-      this.http.get(`${environment.apiUrl}/logs/energyProduced/YTD`).toPromise()
-      .then((data: any) => {
-        // Get all the keys(each meter name) of the returned promise
-        this.metersKeys = Object.keys(data["YTD"]);
-
-        // Get all the values according to each index (meter) 
-        this.metersValues = Object.values(data["YTD"]).map(sub => sub);
-        let meterKeys2 = Object.keys(this.metersValues);
-        
-        // Re-Initialize Json object
-        this.metersData = [];
-
-        // Json object construction for passing its values to the chartjs datasets according to its requirements
-        for (let prop in meterKeys2) { 
-          this.metersData.push({"label": this.metersKeys[prop], backgroundColor: this.barChartColors[prop], data: this.metersValues[prop].map(obj => obj.total_energy_kWh).reverse()});
-          this.barChartLabels = this.metersValues[prop].map(obj => formatDate(obj.dateMax, 'MMM','es-Es','-0600')).reverse();
-        }
-        this.chart1.destroy();
-        this.chart1 = undefined;
-        // Chart draw
-        this.chart1 = new Chart('canvas', {
-          type: 'bar',
-          options: {
-            title: {
-              display: true,
-            },
-            tooltips: {
-              mode: 'index',
-              callbacks: {
-                // Get the total of the energy produced in every point and show it in the hover tooltip
-                label: function (tooltipItem, data) { 
-                  var label = data.datasets[tooltipItem.datasetIndex].label || '';
-                  var value = data.datasets[tooltipItem.datasetIndex].data[tooltipItem.index];
-                  var total = 0;
-
-                  for (var i = 0; i < data.datasets.length; i++)
-                    total += +data.datasets[i].data[tooltipItem.index];
+    this.http.get(`${environment.apiUrl}/logs/energyProduced/YTD`).toPromise()
+    .then((data: any) => {
+      // Get all the keys(each meter name) of the returned promise
+      this.metersKeys = Object.keys(data["YTD"]);
 
-                  if (tooltipItem.datasetIndex !== data.datasets.length - 1) {
-                    return label + " : " + value;
-                  }
-                  else {
-                    return [label + " : " + value, "TOTAL : " + Math.round(total)];
-                  }
+      // Get all the values according to each index (meter) 
+      this.metersValues = Object.values(data["YTD"]).map(sub => sub);
+      let meterKeys2 = Object.keys(this.metersValues);
+      
+      // Re-Initialize Json object
+      this.metersData = [];
+
+      // Json object construction for passing its values to the chartjs datasets according to its requirements
+      for (let prop in meterKeys2) { 
+        let label = localStorage.getItem("email") == "inverlec@grupomerelec.com" ? `INVERLEC ${prop}` : this.metersKeys[prop];
+        this.metersData.push({"label": label, backgroundColor: this.barChartColors[prop], data: this.metersValues[prop].map(obj => obj.total_energy_kWh).reverse()});
+        this.barChartLabels = this.metersValues[prop].map(obj => formatDate(obj.dateMax, 'MMM','es-Es','-0600')).reverse();
+      }
+      this.chart1.destroy();
+      this.chart1 = undefined;
+      // Chart draw
+      this.chart1 = new Chart('canvas', {
+        type: 'bar',
+        options: {
+          title: {
+            display: true,
+          },
+          tooltips: {
+            mode: 'index',
+            callbacks: {
+              // Get the total of the energy produced in every point and show it in the hover tooltip
+              label: function (tooltipItem, data) { 
+                var label = data.datasets[tooltipItem.datasetIndex].label || '';
+                var value = data.datasets[tooltipItem.datasetIndex].data[tooltipItem.index];
+                var total = 0;
+
+                for (var i = 0; i < data.datasets.length; i++)
+                  total += +data.datasets[i].data[tooltipItem.index];
+
+                if (tooltipItem.datasetIndex !== data.datasets.length - 1) {
+                  return label + " : " + value;
+                }
+                else {
+                  return [label + " : " + value, "TOTAL : " + Math.round(total)];
                 }
               }
-            },
-            responsive: true,
-            maintainAspectRatio: false,
-            scales: {
-              xAxes: [{
-                stacked: true,
-              }],
-              yAxes: [{
-                stacked: true
-              }]
             }
           },
-          data: {
-            labels: this.barChartLabels,
-            datasets: 
-              this.metersData,
-          }, 
-        });
-        this.chartjs = true;
+          responsive: true,
+          maintainAspectRatio: false,
+          scales: {
+            xAxes: [{
+              stacked: true,
+            }],
+            yAxes: [{
+              stacked: true
+            }]
+          }
+        },
+        data: {
+          labels: this.barChartLabels,
+          datasets: 
+            this.metersData,
+        }, 
       });
       this.chartjs = true;
+    });
+    
+    setTimeout(()=>{
       Swal.close();
-    }, 2000);
+    }, 3200)
   }
 }

src/app/components/dashboard/dashboard.component.html

@@ -11,7 +11,7 @@
             <h4 class="font-weight-normal mb-3">Total de plantas instaladas
               <i class="mdi mdi-chart-line mdi-24px float-right"></i>
             </h4>
-            <h2 class="mb-3">1</h2>
+            <h2 class="mb-3">{{listData.length}}</h2>
           </div>
         </div>
       </div>

src/app/components/dashboard/dashboard.component.ts

@@ -80,8 +80,6 @@ export class DashboardComponent implements OnInit {
 
     this.plantsService.getAssets().subscribe(res => {
       this.listData = res["assets"];
-      Swal.close();
-
     }, (err) => {
       Swal.fire({
         type: 'error',
@@ -100,18 +98,10 @@ export class DashboardComponent implements OnInit {
       this.totalMetersInstalled = localStorage.getItem("installedCapacityTotal_kW");
     }
     
-  
   }
 
 
   ngOnInit(): void {
-
-    setTimeout(()=>{ 
-      if (this.listData != undefined){
-        this.addMarkers();
-      }
-    }, 1500);
-
     
     var responsiveOptions: any[] = [
       ['screen and (max-width: 640px)', {
@@ -123,6 +113,15 @@ export class DashboardComponent implements OnInit {
         }
       }]
     ];
+    
+    setTimeout(()=>{
+
+      if (this.listData != undefined){
+        this.addMarkers();
+      }
+  
+      Swal.close();
+    }, 2500);
 
   }
 
@@ -132,13 +131,26 @@ export class DashboardComponent implements OnInit {
 
   
   addMarkers() {
+    let lat, long, address, name2;
+
     for (const plant of this.listData) {
-      const lat = plant.latitud;
-      const long = plant.longitud;
+      if (localStorage.getItem("email") == "inverlec@grupomerelec.com"){
+        lat = "13.6613819";
+        long = "-89.2514334";
+        address = "Urbanización Madre Selva Calle Llama del Bosque, Edificio Avante, Local 4-5/4-6, Antiguo Cuscatlán";
+        name2 = "Inversiones MERELEC S.A de C.V";
+      }
+      else {
+        lat = plant.latitud;
+        long = plant.longitud;
+        address = plant.address;
+        name2 = plant.name;
+      }
+      
       const newMarker = marker(
         [lat, long],
         {icon: this.icon})
-        .bindPopup('<b>' + plant.name + '</b><br>Dirección: ' + plant.address)
+        .bindPopup('<b>' + name2 + '</b><br>Dirección: ' + address)
         .on('click', () => {
           this.zone.run(() => {
             this.sendPlantId(plant.id);
@@ -151,9 +163,18 @@ export class DashboardComponent implements OnInit {
 
   sendPlantId(id: string) {
     this.plantId = id;
-    this.selectedPlant = this.listData.find(e => e.id === this.plantId);
-    console.log("selected plant");
-    console.log(this.selectedPlant);
+    if (localStorage.getItem("email") == "inverlec@grupomerelec.com"){
+      this.selectedPlant = {
+        name: "Inversiones MERELEC S.A de C.V",
+        country: "El Salvador",
+        city: "La Libertad",
+        address: "Urbanización Madre Selva Calle Llama del Bosque, Edificio Avante, Local 4-5/4-6, Antiguo Cuscatlán",
+        installedCapacity_kW: 300
+      }
+    }
+    else {
+      this.selectedPlant = this.listData.find(e => e.id === this.plantId);
+    }
   }
 
   onMapReady(map: Map) {

src/app/components/login/login.component.html

@@ -14,22 +14,16 @@
               <div class="form-group">
                 <label for="email">Correo electrónico</label>
                 
-                <input type="text" name="email" class="form-control" [ngClass]="{ 'is-invalid': submitted && f.controls['email'].errors }"
+                <input type="text" name="email" class="form-control"
                         [(ngModel)]="user.email"  required email />
-                <div *ngIf="submitted && f.controls['email'].errors" class="invalid-feedback">
-                    <div *ngIf="f.username.errors.required">Ingresar email</div>
-                </div>
+
               </div>
               <div class="form-group">
                 <label for="password">Contraseña</label>
-                <input type="password" name="password"  class="form-control" [ngClass]="{ 'is-invalid': submitted && f.controls['password'].errors }" 
+                <input type="password" name="password"  class="form-control"
                         [(ngModel)]="user.password" required minlength="6" />
-                <div *ngIf="submitted && f.controls['password'].errors" class="invalid-feedback">
-                    <div *ngIf="f.password.errors.required">Password is required</div>
-                </div>
               </div>
-              <button [disabled]="loading" class="btn btn-primary">
-                <span *ngIf="loading" class="spinner-border spinner-border-sm mr-1"></span>
+              <button class="btn btn-primary">
                 Iniciar sesión
               </button>
               <!--<div *ngIf="error" class="alert alert-danger mt-3 mb-0">{{error}}</div>-->

src/app/components/login/login.component.ts

@@ -63,9 +63,7 @@ export class LoginComponent implements OnInit {
 
         Swal.close();
 
-        if ( this.recordarme ) {
-          localStorage.setItem('email', this.user.email);
-        }
+        localStorage.setItem('email', this.user.email);
 
         //this.router.navigate([this.returnUrl]);
         window.location.href="/";

src/app/components/shared/navbar/navbar.component.ts

@@ -145,7 +145,9 @@ export class NavbarComponent implements OnInit {
 
     logout() {
       this.auth.logout();
-      this.router.navigateByUrl("login");
+      window.location.href="/";
+
+      //this.router.navigateByUrl("login");
     }
 
     getTitle(){

src/app/components/shared/sidebar/sidebar.component.ts

@@ -46,7 +46,9 @@ export class SidebarComponent implements OnInit {
 
   logout() {
     this.auth.logout();
-    this.router.navigateByUrl("login");
+    window.location.href="/";
+
+    //this.router.navigateByUrl("login");
   };
 
 }

src/environments/environment.prod.ts

@@ -1,3 +1,5 @@
 export const environment = {
-  production: true
+  production: true,
+  apiUrl: 'http://192.168.98.140:8000',
+  appID: '55899b9ea53834f2736b65a3582b734b',
 };