Explorar el Código

chart fix for radar type, visual change on savings card

Oscar José Nuñez Chávez hace 6 años
padre
commit
83f429085d

+ 3 - 2
src/app/components/assets/assets.component.scss

@@ -199,12 +199,13 @@ table {
 
       span {
         border: none;
-        color: #39843c;
-        font-size: 18px;
+        color: #055;
+        font-size: 20px;
         line-height: 0;
         text-align: center;
         position: static;
         display: inline;
+        font-weight: bold;
       }
     }
 

+ 8 - 0
src/app/components/assets/assets.component.ts

@@ -586,12 +586,20 @@ export class AssetsComponent implements OnInit {
     { 
       case "bar": 
         this.chartActive = [true, false, false, false];
+        if(this.metersData.find(v => (v.type == "radar"))){
+          this.metersData.find(v => (v.type != "line")).type = "line";
+        }
+
         break; 
       case "line": 
         this.chartActive = [false, true, false, false];
+        if(this.metersData.find(v => (v.type == "radar"))){
+          this.metersData.find(v => (v.type != "line")).type = "line";
+        }
         break; 
       case "radar":
         this.chartActive = [false, false, true, false];
+        this.metersData.find(v => v.type == "line").type = "radar";
         break; 
       default: 
     }  

+ 6 - 2
src/app/components/plants/edit-plant/edit-plant.component.html

@@ -71,7 +71,9 @@
                   
                   <div class="form-group">
                     <label for="categoria_tarifaria">Categoría tarifaria: </label>
-                    <input type="text" formControlName="categoria_tarifaria" class="form-control" [ngClass]="{ 'is-invalid': submitted && f.categoria_tarifaria.errors }" />
+                    <select class="custom-select" formControlName="categoria_tarifaria" [ngClass]="{ 'is-invalid': submitted && f.categoria_tarifaria.errors }">
+                      <option *ngFor="let item of categoria_tarifaria" [value]="item" [selected]="item==listPlant.categoria_tarifaria" >{{item}}</option>
+                    </select>
                     <div *ngIf="submitted && f.categoria_tarifaria.errors" class="invalid-feedback">
                       <div *ngIf="f.categoria_tarifaria.errors.required">Campo requerido</div>
                     </div>
@@ -79,7 +81,9 @@
                   
                   <div class="form-group">
                     <label for="cod_tarifa">Código de tarifa: </label>
-                    <input type="text" formControlName="cod_tarifa" class="form-control" [ngClass]="{ 'is-invalid': submitted && f.cod_tarifa.errors }" />
+                    <select class="custom-select" formControlName="cod_tarifa" [ngClass]="{ 'is-invalid': submitted && f.cod_tarifa.errors }">
+                      <option *ngFor="let item of codigo_tarifa" [value]="item" [selected]="item==listPlant.cod_tarifa" >{{item}}</option>
+                    </select>
                     <div *ngIf="submitted && f.cod_tarifa.errors" class="invalid-feedback">
                       <div *ngIf="f.cod_tarifa.errors.required">Campo requerido</div>
                     </div>

+ 6 - 3
src/app/components/plants/edit-plant/edit-plant.component.ts

@@ -18,10 +18,13 @@ export class EditPlantComponent implements OnInit {
   assetID:any;
   role_number: any;
   assetExists:boolean;
-  distributor = ['CAESS', 'DEL SUR', 'AES-CLESA', 'EEO', 'DEUSEM'];
+  distributor = ["EEO","CAESS","DELSUR","CLESA","DEUSEM","ABRUZZO","EDESAL","B&D","DEL SUR"];
+  categoria_tarifaria = ["PD", "MD", "GD"];
+  codigo_tarifa = ["R","G","AP","MD CMP - BT","MD CMP - MT","MD CMH - BT","MD CMH - MT","GD CMH - BT", "GD CMH - MT"];
 
-  constructor(private plantsService: PlantsService, private formBuilder: FormBuilder, private route: ActivatedRoute) {
 
+  constructor(private plantsService: PlantsService, private formBuilder: FormBuilder, private route: ActivatedRoute) {
+    
     this.route.params.subscribe(params => {
       this.assetID = params['id'];
     });
@@ -29,7 +32,6 @@ export class EditPlantComponent implements OnInit {
     this.plantsService.getAssetById(this.assetID).subscribe(res => {
       this.listPlant = res["data"]["asset"];
       this.organizationExists = true;
-
       this.assetForm = this.formBuilder.group({
         name: [this.listPlant.name],
         country: [this.listPlant.country],
@@ -66,6 +68,7 @@ export class EditPlantComponent implements OnInit {
         distribuidora: this.f.distribuidora.value,
         categoria_tarifaria: this.f.categoria_tarifaria.value,
         cod_tarifa: this.f.cod_tarifa.value,
+        meters_installed: this.listPlant.meters_installed
       }
     )
     .subscribe(success => {

+ 6 - 2
src/app/components/plants/new-plant/new-plant.component.html

@@ -73,7 +73,9 @@
                   
                   <div class="form-group">
                     <label for="categoria_tarifaria">Categoría tarifaria: </label>
-                    <input type="text" formControlName="categoria_tarifaria" class="form-control" [ngClass]="{ 'is-invalid': submitted && f.categoria_tarifaria.errors }" />
+                    <select class="custom-select" formControlName="categoria_tarifaria" [ngClass]="{ 'is-invalid': submitted && f.categoria_tarifaria.errors }">
+                      <option *ngFor="let item of categoria_tarifaria" [value]="item" >{{item}}</option>
+                    </select>
                     <div *ngIf="submitted && f.categoria_tarifaria.errors" class="invalid-feedback">
                       <div *ngIf="f.categoria_tarifaria.errors.required">Campo requerido</div>
                     </div>
@@ -81,7 +83,9 @@
                   
                   <div class="form-group">
                     <label for="cod_tarifa">Código de tarifa: </label>
-                    <input type="text" formControlName="cod_tarifa" class="form-control" [ngClass]="{ 'is-invalid': submitted && f.cod_tarifa.errors }" />
+                    <select class="custom-select" formControlName="cod_tarifa" [ngClass]="{ 'is-invalid': submitted && f.cod_tarifa.errors }">
+                      <option *ngFor="let item of codigo_tarifa" [value]="item" >{{item}}</option>
+                    </select>
                     <div *ngIf="submitted && f.cod_tarifa.errors" class="invalid-feedback">
                       <div *ngIf="f.cod_tarifa.errors.required">Campo requerido</div>
                     </div>

+ 5 - 3
src/app/components/plants/new-plant/new-plant.component.ts

@@ -13,8 +13,10 @@ export class NewPlantComponent implements OnInit {
   assetForm: FormGroup;
   submitted: boolean = false;
   role_number: any;
-  distributor = ['CAESS', 'DEL SUR', 'AES-CLESA', 'EEO', 'DEUSEM'];
-  
+  distributor = ["EEO","CAESS","DELSUR","CLESA","DEUSEM","ABRUZZO","EDESAL","B&D","DEL SUR"];
+  categoria_tarifaria = ["PD", "MD", "GD"];
+  codigo_tarifa = ["R","G","AP","MD CMP - BT","MD CMP - MT","MD CMH - BT","MD CMH - MT","GD CMH - BT", "GD CMH - MT"];
+
   constructor(private plantService: PlantsService, private formBuilder: FormBuilder) { }
 
   ngOnInit() {
@@ -48,7 +50,7 @@ export class NewPlantComponent implements OnInit {
         distribuidora: this.f.distribuidora.value,
         categoria_tarifaria: this.f.categoria_tarifaria.value,
         cod_tarifa: this.f.cod_tarifa.value,
-        meters_installed: [""]
+        meters_installed: []
       }
     )
     .subscribe(success => {

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

@@ -52,9 +52,7 @@
                   
                   <div class="form-group">
                     <label for="distribuidora">Distribuidora: </label>
-                    <select class="custom-select" readonly formControlName="distribuidora" >
-                      <option *ngFor="let item of distributor" [value]="item" [selected]="item==listPlant.distribuidora" >{{item}}</option>
-                    </select>
+                    <input type="text" readonly formControlName="distribuidora" class="form-control" />
                   </div>
                   
                   <div class="form-group">

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

@@ -22,7 +22,6 @@ export class PlantComponent implements OnInit {
   distributor = ['CAESS', 'DEL SUR', 'AES-CLESA', 'EEO', 'DEUSEM'];
 
   constructor(private plantsService: PlantsService, private formBuilder: FormBuilder, private route: ActivatedRoute) {
-    console.log("GET HERE")
     this.route.params.subscribe(params => {
       this.assetID = params['id'];
     });