Ajustes na tela de Infraestrutura e novas salas, desabilitando campos quando for Brasil.

src/app/simulator/quality-conditions/infrastructure-school-buildings/infrastructure-school-buildings.component.html

@@ -54,7 +54,10 @@
                     <th *ngIf="!pqrMode" rowspan="3">Mês/ano referência</th>
                   </tr>
                   <tr>
-                    <th rowspan="2">Dimensão m2</th>
+                    <th rowspan="2"><span [class.dimension-title]="processDisabledData(pqrAdminMode)"
+                        [popover]="popoverText" placement="bottom" container="body" [triggers]="popoverTriggers"
+                        [isOpen]="processDisabledData(pqrAdminMode)" containerClass="popover-simcaq result">Dimensão
+                        m2</span></th>
                     <th rowspan="2">Unidade de Medida</th>
                     <th *ngIf="!pqrMode" rowspan="2">Preço por m2 (R$) <sup>(3)</sup></th>
                   </tr>
@@ -87,13 +90,13 @@
                       </ng-container>
                       <td>
                         <input type="text" class="form-control dimension plan-value" [(ngModel)]="dependency.dimension"
-                          [disabled]="!pqrAdminMode && pqrMode" currencyMask
+                          [disabled]="processDisabledData(pqrAdminMode)" currencyMask
                           [options]="{ prefix: '', align: 'right', precision: 2, thousands: '.', decimal: ',' }">
                       </td>
                       <td class="unit-measurement-description">{{dependency.unitOfMeasurement.description}}</td>
                       <td *ngIf="!pqrMode">
                         <input type="text" class="form-control unit-price plan-value" [(ngModel)]="dependency.unitPrice"
-                          currencyMask
+                          currencyMask [disabled]="processDisabledData(pqrAdminMode)"
                           [options]="{ prefix: 'R$ ', align: 'right', precision: 2, thousands: '.', decimal: ',' }">
                       </td>
                       <td *ngIf="!pqrMode">

src/app/simulator/quality-conditions/infrastructure-school-buildings/infrastructure-school-buildings.component.scss

@@ -9,6 +9,10 @@
     min-width: 120px;
 }
 
+.dimension-title {
+    cursor: pointer;
+}
+
 .dependency-title {
     background-color: $differentiated-table-background-color;
     font-weight: bold;

src/app/simulator/quality-conditions/infrastructure-school-buildings/infrastructure-school-buildings.component.ts

-import { Component, Injector, Type } from '@angular/core';
+import { Component, Injector, Type, OnInit } from '@angular/core';
 import { Observable } from 'rxjs';
 
 import { PqrComponentData } from '../../shared/entities/base/pqr-component-data';
@@ -13,6 +13,7 @@ import { InfrastructureSchoolBuildings } from './entities/infrastructure-school-
 import { CsvHeader } from '../../../shared/services/csv/entities/csv-header';
 import { CsvService } from '../../../shared/services/csv/csv.service';
 import { Csv } from '../../../shared/services/csv/entities/csv';
+import { SelectLocation } from 'app/simulator/select-location/entities/select-location';
 
 @Component({
   selector: 'app-infrastructure-school-buildings',
@@ -20,7 +21,7 @@ import { Csv } from '../../../shared/services/csv/entities/csv';
   styleUrls: ['./infrastructure-school-buildings.component.scss']
 })
 
-export class InfrastructureSchoolBuildingsComponent extends BaseNavigableComponent<InfrastructureSchoolsBuildings> implements PqrComponentData {
+export class InfrastructureSchoolBuildingsComponent extends BaseNavigableComponent<InfrastructureSchoolsBuildings> implements PqrComponentData, OnInit {
 
   data: InfrastructureSchoolsBuildings = new InfrastructureSchoolsBuildings();
   functionality: FunctionalityInfo = Functionality.infrastructureSchoolBuildings;
@@ -29,13 +30,26 @@ export class InfrastructureSchoolBuildingsComponent extends BaseNavigableCompone
   pqrMode: boolean;
   pqrModalMode: boolean;
   componentType: Type<PqrComponentData> = InfrastructureSchoolBuildingsComponent;
-
+  selectLocationData: SelectLocation = this.sessionService.getItem<SelectLocation>(Functionality.selectLocation.key);
+  disabledData: boolean = true;
+  popoverTriggers: string;
+  popoverText: string = 'Esses parâmetros só podem ser alterados para simulações em nível estadual ou municipal. ' +
+    'Para simulações em nível nacional, são apresentados resultados dos valores estaduais agregados internamente pelo simulador.';
   referenceDateMask: any = this.utilitiesService.getReferenceDateMask();
 
   constructor(private injector: Injector, private infrastructureSchoolBuildingsService: InfrastructureSchoolBuildingsService, private csvService: CsvService) {
     super(injector);
   }
 
+  ngOnInit(): void {
+    super.ngOnInit();
+    this.disabledData = this.processDisabledData();
+
+    if (this.disabledData) {
+      this.popoverTriggers = 'mouseenter:mouseleave';
+    }
+  }
+
   processData(): Observable<InfrastructureSchoolsBuildings> {
     return this.infrastructureSchoolBuildingsService.getData(this.pqrMode);
   }
@@ -125,4 +139,18 @@ export class InfrastructureSchoolBuildingsComponent extends BaseNavigableCompone
     const csv: Csv = new Csv({ header: header, data: data, name: 'Infraestrutura dos prédios escolares' });
     this.csvService.download(csv);
   }
+
+  processDisabledData(pqrAdminMode: boolean = false): boolean {
+
+    if (pqrAdminMode) {
+      return false;
+    } else {
+      if (!(!this.pqrAdminMode && this.pqrMode)) {
+        return this.disabledData = !this.selectLocationData || !(this.selectLocationData.selectedCity || this.selectLocationData.selectedState);
+      } else {
+        return !this.pqrAdminMode && this.pqrMode;
+      }
+    }
+  }
+
 }

src/app/simulator/quality-conditions/new-room-building/new-room-building.component.html

@@ -45,7 +45,7 @@
                   <tr>
                     <th rowspan="2">Demanda por construção</th>
                     <th *ngIf="!pqrMode" colspan="2">
-                      <span [class.projection-title]="disabledData" [popover]="popoverText" placement="bottom"
+                      <span [class.quantity-title]="disabledData" [popover]="popoverText" placement="bottom"
                         container="body" [triggers]="popoverTriggers" [isOpen]="disabledData"
                         containerClass="popover-simcaq result">Quantidade</span>
                     </th>

src/app/simulator/quality-conditions/new-room-building/new-room-building.component.scss

@@ -9,6 +9,10 @@
     min-width: 120px;
 }
 
+.quantity-title {
+    cursor: pointer;
+}
+
 .disable-th-cell {
     background-color: $differentiated-table-background-color;
     color: #000;

src/app/simulator/quality-conditions/new-room-building/new-room-building.component.ts

@@ -29,9 +29,10 @@ export class NewRoomBuildingComponent extends BaseNavigableComponent<NewRoomsBui
   pqrModalMode: boolean;
   locationUrban: number = LocationEnum.urban;
   locationRural: number = LocationEnum.rural;
+  selectLocationData: SelectLocation = this.sessionService.getItem<SelectLocation>(Functionality.selectLocation.key);
   disabledData: boolean = true;
   popoverTriggers: string;
-  popoverText: string = 'Esses parâmetros só podem ser alterados para simulações em nível municipal ou estadual. ' +
+  popoverText: string = 'Esses parâmetros só podem ser alterados para simulações em nível estadual ou municipal. ' +
     'Para simulações em nível nacional, são apresentados resultados dos valores municipais agregados internamente pelo simulador.';
 
   componentType: Type<PqrComponentData> = NewRoomBuildingComponent;
@@ -144,8 +145,7 @@ export class NewRoomBuildingComponent extends BaseNavigableComponent<NewRoomsBui
       return false;
     } else {
       if (!(!this.pqrAdminMode && this.pqrMode)) {
-        const selectLocationData: SelectLocation = this.sessionService.getItem<SelectLocation>(Functionality.selectLocation.key);
-        return this.disabledData = !selectLocationData || !(selectLocationData.selectedCity || selectLocationData.selectedState);
+        return this.disabledData = !this.selectLocationData || !(this.selectLocationData.selectedCity || this.selectLocationData.selectedState);
       } else {
         return !this.pqrAdminMode && this.pqrMode;
       }