Explorar o código

bugs fixed, change item size in datatables in general

Oscar José Nuñez Chávez %!s(int64=6) %!d(string=hai) anos
pai
achega
9606f0cd03

+ 2 - 2
src/app/components/assets/assets.component.html

@@ -72,7 +72,7 @@
           <span class="sky-skin"><i class="fa fa-bolt"></i></span>
           <h3 *ngIf="eProduced">
             {{energyDay}}
-            <small>kW</small>
+            <small>kWh</small>
           </h3>
           <p>Ultimo dia</p>
         </div>
@@ -237,7 +237,7 @@
           </div>
           <div class="enviromental-text">
             <span>{{environmentFuel}}</span>
-            Barriles de petroleo crudo producidos en 1 año.
+            Barriles de petróleo crudo producidos.
           </div>
         </div>
       </div>

+ 2 - 1
src/app/components/assets/assets.component.ts

@@ -161,7 +161,8 @@ export class AssetsComponent implements OnInit {
       else {
         this.city = this.listAssets.find(object=>object.id == this.assetID).city;
       }
-
+      console.log("asset city");
+      console.log(this.city);
       let tempAsset = this.listAssets.find(object=>object.id == this.assetID);
 
       if (tempAsset["meters_installed"].length > 0){

+ 1 - 1
src/app/components/dashboard/dashboard.component.html

@@ -118,7 +118,7 @@
               <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
               <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
             </table>
-            <mat-paginator [pageSizeOptions]="[5, 10, 25]"></mat-paginator>
+            <mat-paginator [pageSizeOptions]="[5, 10, 20]" [pageIndex]="0" [pageSize]="5"></mat-paginator>
           </div>
         </div>
       </div>

+ 1 - 1
src/app/components/organizations/organizations.component.html

@@ -74,7 +74,7 @@
                   <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
                   <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
                 </table>
-                <mat-paginator [pageSizeOptions]="[5, 10, 25]"></mat-paginator>
+                <mat-paginator [pageSizeOptions]="[10, 15, 25]" [pageIndex]="0" [pageSize]="10"></mat-paginator>
               </div>
             </div>
           </div>

+ 1 - 2
src/app/components/plants/edit-plant/edit-plant.component.ts

@@ -36,7 +36,7 @@ export class EditPlantComponent implements OnInit {
     { key:"GD CMH - BT", value: "GD CMH-BT Gran Demanda Con Medicion Horaria Baja Tensión" },
     { key:"GD CMH - MT", value: "GD CMH-MT Gran Demanda Con Medicion Horaria Media Tensión" }
   ];
-  
+
   constructor(private plantsService: PlantsService, private formBuilder: FormBuilder, private route: ActivatedRoute) {
     
     this.route.params.subscribe(params => {
@@ -71,7 +71,6 @@ export class EditPlantComponent implements OnInit {
   }
 
   get f() { return this.assetForm.controls; }
-
   editAsset() {
     this.plantsService.updatePlant(this.assetID, 
       {

+ 1 - 1
src/app/components/plants/plants.component.html

@@ -71,7 +71,7 @@
                   <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
                   <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
                 </table>
-                <mat-paginator [pageSizeOptions]="[5, 10, 25]"></mat-paginator>
+                <mat-paginator [pageSizeOptions]="[10, 15, 25]" [pageIndex]="0" [pageSize]="10"></mat-paginator>
               </div>
             </div>
           </div>

+ 7 - 1
src/app/components/plugins/weather-card/weather-card.component.html

@@ -1,5 +1,5 @@
 <div class="widget">
-  <div class="row">
+  <div class="row no-gutters">
     <div class="col-7">
       <div class="date">
         {{currentDate}}
@@ -18,4 +18,10 @@
       </div>
     </div>
   </div>
+  <div class="row no-gutters" *ngIf="errorWeather">
+    <div class="error-weather alert" role="alert">
+      <i class="fas fa-exclamation-circle"></i>
+      {{errorMessage}}
+    </div>
+  </div>
 </div>

+ 16 - 0
src/app/components/plugins/weather-card/weather-card.component.scss

@@ -71,3 +71,19 @@ div.right-panel
   margin-top: 35px;
   padding-left: 10px;
 }
+
+.error-weather {
+  border: 0;
+  border-radius: 3px;
+  position: relative;
+  padding: 5px;
+  line-height: 10px;
+  font-size: 10px;
+  color:rgba(0, 0, 0, 0.5);
+  margin: 5px 0;
+  background: #FFF3CD;
+  width: 100%;
+  i {
+    color: inherit;
+  }
+}

+ 6 - 1
src/app/components/plugins/weather-card/weather-card.component.ts

@@ -30,7 +30,7 @@ export class WeatherCardComponent implements OnInit, OnChanges {
   pipe = new DatePipe('es-ES')
   newDate = Date.now();
   currentDate = this.pipe.transform(this.newDate, 'fullDate')
-
+  errorWeather: boolean = false;
   constructor(public weather: WeatherService, public router: Router) {
 
   }
@@ -59,13 +59,18 @@ export class WeatherCardComponent implements OnInit, OnChanges {
     this.weather.getWeather(city)
     .pipe(first())
     .subscribe((payload) => {
+      this.errorWeather = false;
       this.cityName = payload.name
       this.state = payload.weather[0].description;
       this.temp = Math.ceil(payload.main.temp);
       this.icon_exists = true;
       this.icon = payload.weather[0].icon;
     }, (err) => {
+      this.errorWeather = true;
       this.errorMessage = err.error.message;
+      if (this.errorMessage == "city not found"){
+        this.errorMessage = "Datos del clima para el municipio de la planta no disponible.";
+      }
     });
 
   }

+ 1 - 1
src/app/components/users/users.component.html

@@ -67,7 +67,7 @@
                   <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
                   <tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
                 </table>
-                <mat-paginator [pageSizeOptions]="[5, 10, 25]"></mat-paginator>
+                <mat-paginator [pageSizeOptions]="[10, 15, 25]" [pageIndex]="0" [pageSize]="10"></mat-paginator>
               </div>
             </div>
           </div>