Projekt

Obecné

Profil

« Předchozí | Další » 

Revize cbb91c90

Přidáno uživatelem Jakub Hlaváč před téměř 4 roky(ů)

Re #8915 - Zapracování požadavků ze schůzky

+ sensor edit under edit button in menu
  • request for sensor data only for first time, then after button click
    + sensor group names
    + adding information to unit and sensor
    + commenting
    + code refactor

Zobrazit rozdíly:

src/app/unit/components/unit.component.html
2 2

  
3 3
<div class="container">
4 4
  <div class="row-2">
5
      <h5><span class="text-color-sensor-unit">Unit ID: {{unitId}}</span></h5>
5
    <h5><span class="text-color-sensor-unit">Unit description: {{unitDescription}}</span></h5>
6 6
  </div>
7 7
  <div class="row">
8 8
    <div class="col">
9 9
      <div class="input-group form-group">
10 10
        <div class="input-group-prepend">
11
          <span class="input-group-text">From</span>
11
          <span class="input-group-text text-color-date background-date-color"><i class="fa fa-calendar-alt" aria-hidden="false"></i>From</span>
12 12
        </div>
13
        <p-calendar [style]="{'width':'100%'}" [inputStyle]="{'width':'100%'}" [(ngModel)]="from" [showTime]="true" (onSelect)="showGraph()" [maxDate]="today" showButtonBar="true"></p-calendar>
13
        <p-calendar [style]="{'width':'100%'}" [inputStyle]="{'width':'100%'}" [(ngModel)]="from" [showTime]="true" (onSelect)="aggregationShow()" [maxDate]="today" showButtonBar="true"></p-calendar>
14 14
      </div>
15 15
    </div>
16 16
    <div class="col">
17 17
      <div class="input-group form-group">
18 18
        <div class="input-group-prepend">
19
          <span class="input-group-text">To</span>
19
          <span class="input-group-text text-color-date background-date-color"><i class="fa fa-calendar-alt" aria-hidden="false"></i>To</span>
20 20
        </div>
21
        <p-calendar [style]="{'width':'100%'}" [inputStyle]="{'width':'100%'}" [(ngModel)]="to" [showTime]="true" (onSelect)="showGraph()" [maxDate]="today" showButtonBar="true"></p-calendar>
21
        <p-calendar [style]="{'width':'100%'}" [inputStyle]="{'width':'100%'}" [(ngModel)]="to" [showTime]="true" (onSelect)="aggregationShow()" [maxDate]="today" showButtonBar="true"></p-calendar>
22 22
      </div>
23 23
    </div>
24
    <div *ngIf="showAggregation" class="col">
24
    <div class="col">
25 25
      <div class="input-group form-group">
26
        <div class="input-group-prepend">
27
          <span class="input-group-text">Aggregation</span>
26
        <div class="input-group form-group">
27
          <p-listbox *ngIf="showAggregation" [options]="aggregationFunction" [(ngModel)]="selectedAggregationFunction" optionLabel="name" optionValue="code"></p-listbox>
28 28
        </div>
29
        <p-listbox [options]="aggregationFunction" [(ngModel)]="selectedAggregationFunction" optionLabel="name" optionValue="code" (onClick)="showGraph()" ></p-listbox>
30 29
      </div>
31 30
    </div>
31
    <div class="col-xs-3">
32
      <p-button *ngIf="dateChanged" label="Get data" icon="pi pi-cog" styleClass="p-button-success" (click)="showGraph()"></p-button>
33
    </div>
32 34
  </div>
33 35

  
34 36
  <ng-container *ngFor="let group of sensorGroups">
35 37
    <div class="row">
36
    Group of sensors:
38
    Group of
39
    <ng-container *ngFor="let sensorType of sensorTypes">
40
      <ng-container *ngIf="sensorType.sensorId.toString().slice(0, 5) === group">
41
        {{sensorType.sensorType}}
42
      </ng-container>
43
    </ng-container>
44
      sensors:
37 45
      <ng-container *ngFor="let sensor of sensors">
38 46
          <div *ngIf="sensor.sensorId.toString().slice(0, 5) === group" class="p-field-checkbox">
39 47
            <p-checkbox name="{{group}}" [value]="sensor.sensorId.toString()" [(ngModel)]="selectedSensors" [inputId]="sensor.sensorId.toString()" (onChange)="addSensorToGraph(sensor.sensorId.toString(), $event)"></p-checkbox>

Také k dispozici: Unified diff