Skip to content

Commit 4e250e7

Browse files
fcv-iteratorItfcv-iteratorIt
committed
Last styling fixes
1 parent be63dd6 commit 4e250e7

File tree

8 files changed

+232
-208
lines changed

8 files changed

+232
-208
lines changed

‎src/app/admin/permission/permission-edit/permission-edit.component.html‎

Lines changed: 43 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -113,50 +113,53 @@
113113
</select>
114114
</div>
115115
</div>
116-
} @if (isOrganizationApplicationPermission()) {
117-
<div class="form-group mt-3 col-12">
118-
<label class="form-label" for="name">{{ "PERMISSION.EDIT.APPS" | translate }}</label>
119-
<div class="col-12">
120-
<mat-select
121-
#multiSelect
122-
[(value)]="permission.applicationIds"
123-
[compareWith]="compare"
124-
[formControl]="applicationMultiCtrl"
125-
[multiple]="true"
126-
class="form-control"
127-
id="applicationIds"
128-
name="applicationIds"
129-
panelClass="overflow-x-hidden"
130-
>
131-
<app-mat-select-search
132-
[formControl]="applicationMultiFilterCtrl"
133-
[initialValues]="this.permission.applicationIds"
134-
></app-mat-select-search>
135-
@for (app of filteredApplicationsMulti | async; track app) {
136-
<mat-option [value]="app.id">
137-
{{ app.name }}
138-
</mat-option>
139-
}
140-
</mat-select>
141-
</div>
142-
</div>
143-
} @if (isReadOrWrite()) {
144-
<div>
116+
}
117+
@if (isOrganizationApplicationPermission()) {
145118
<div class="form-group mt-3 col-12">
146-
<label class="form-label" for="name">{{ "PERMISSION.EDIT.ADD-APPLICATION-AUTOMATIC" | translate }}</label>
147-
<div class="row">
148-
<mat-slide-toggle
149-
[(ngModel)]="permission.automaticallyAddNewApplications"
150-
id="automaticallyAddNewApplications"
151-
name="automaticallyAddNewApplications"
152-
>
153-
{{ "PERMISSION.EDIT.ADD-APPLICATION-ON-CREATE" | translate }}
154-
</mat-slide-toggle
119+
<label class="form-label" for="name">{{ "PERMISSION.EDIT.APPS" | translate }}</label>
120+
<div class="col-12">
121+
<mat-select
122+
#multiSelect
123+
[(value)]="permission.applicationIds"
124+
[compareWith]="compare"
125+
[formControl]="applicationMultiCtrl"
126+
[multiple]="true"
127+
class="form-control"
128+
id="applicationIds"
129+
name="applicationIds"
130+
panelClass="overflow-x-hidden"
155131
>
132+
<app-mat-select-search
133+
[formControl]="applicationMultiFilterCtrl"
134+
[initialValues]="this.permission.applicationIds"
135+
></app-mat-select-search>
136+
@for (app of filteredApplicationsMulti | async; track app) {
137+
<mat-option [value]="app.id">
138+
{{ app.name }}
139+
</mat-option>
140+
}
141+
</mat-select>
156142
</div>
157143
</div>
158-
</div>
159-
}
144+
}
145+
@if (isReadOrWrite()) {
146+
<div>
147+
<div class="form-group mt-3 col-12">
148+
<label class="form-label" for="name">{{ "PERMISSION.EDIT.ADD-APPLICATION-AUTOMATIC" | translate }}</label>
149+
<div class="row">
150+
<mat-slide-toggle
151+
[(ngModel)]="permission.automaticallyAddNewApplications"
152+
color=""
153+
id="automaticallyAddNewApplications"
154+
name="automaticallyAddNewApplications"
155+
>
156+
{{ "PERMISSION.EDIT.ADD-APPLICATION-ON-CREATE" | translate }}
157+
</mat-slide-toggle
158+
>
159+
</div>
160+
</div>
161+
</div>
162+
}
160163

161164
<div class="form-group mt-5">
162165
<button (click)="routeBack()" class="btn btn-secondary" type="button">{{ "GEN.CANCEL" | translate }}</button>

‎src/app/admin/users/user-edit/user-edit.component.html‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@
77
<li>
88
{{ error | translate }}
99
</li>
10-
} @if (errorMessage) {
11-
<li>
12-
{{ errorMessage | translate }}
13-
</li>
14-
}
10+
}
11+
@if (errorMessage) {
12+
<li>
13+
{{ errorMessage | translate }}
14+
</li>
15+
}
1516
</ul>
1617
</div>
1718
}
@@ -121,14 +122,14 @@
121122
</div>
122123

123124
<div class="row mb-5">
124-
<mat-slide-toggle [(ngModel)]="user.active" id="active" name="active">
125+
<mat-slide-toggle [(ngModel)]="user.active" color="" id="active" name="active">
125126
{{ "USERS.FORM.ACTIVE" | translate }}
126127
</mat-slide-toggle
127128
>
128129
</div>
129130
@if (isGlobalAdmin) {
130131
<div class="row mb-3">
131-
<mat-slide-toggle [(ngModel)]="user.globalAdmin" id="globalAdmin" name="globalAdmin">
132+
<mat-slide-toggle [(ngModel)]="user.globalAdmin" color="" id="globalAdmin" name="globalAdmin">
132133
{{ "USERS.FORM.GLOBAL-ADMIN" | translate }}
133134
</mat-slide-toggle
134135
>

‎src/app/applications/iot-devices/iot-device-detail/downlink/downlinks/downlink.component.html‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,26 @@ <h3 class="headerStyle">{{ "IOTDEVICE.DOWNLINK.STARTDOWNLINK" | translate }}</h3
1616
@if (device.type === 'LORAWAN') {
1717
<div>
1818
<mat-label class="form-label me-3">{{ "IOTDEVICE.DOWNLINK.CONFIRMEDDOWNLINK" | translate }}</mat-label>
19-
<mat-slide-toggle [(ngModel)]="downlink.confirmedDownlink" id="confirmedDownlink" name="confirmedDownlink">
19+
<mat-slide-toggle [(ngModel)]="downlink.confirmedDownlink" color="" id="confirmedDownlink"
20+
name="confirmedDownlink">
2021
</mat-slide-toggle>
2122
</div>
22-
} @if (device.type === 'LORAWAN') {
23-
<div class="mt-2 col-6">
24-
<label class="form-label asterisk-if-mandatory" for="port">{{ "IOTDEVICE.DOWNLINK.PORT" | translate }}</label>
25-
<input
26-
[(ngModel)]="downlink.port"
27-
class="form-control"
28-
id="port"
29-
maxlength="50"
30-
min="0"
31-
name="port"
32-
required
33-
type="port"
34-
/>
35-
</div>
36-
}
23+
}
24+
@if (device.type === 'LORAWAN') {
25+
<div class="mt-2 col-6">
26+
<label class="form-label asterisk-if-mandatory" for="port">{{ "IOTDEVICE.DOWNLINK.PORT" | translate }}</label>
27+
<input
28+
[(ngModel)]="downlink.port"
29+
class="form-control"
30+
id="port"
31+
maxlength="50"
32+
min="0"
33+
name="port"
34+
required
35+
type="port"
36+
/>
37+
</div>
38+
}
3739
<div class="mt-2 col-6">
3840
<label class="form-label asterisk-if-mandatory"
3941
for="data">{{ "IOTDEVICE.DOWNLINK.PAYLOAD" | translate }}</label>
@@ -61,12 +63,12 @@ <h3 class="headerStyle">{{ "IOTDEVICE.DOWNLINK.STARTDOWNLINK" | translate }}</h3
6163
</div>
6264
</div>
6365
} @else {
64-
<div class="my-2 mx-3">
65-
<p>
66-
{{ "IOTDEVICE.DOWNLINK.NOTIMPLEMENTED" | translate }}
67-
</p>
68-
</div>
69-
}
66+
<div class="my-2 mx-3">
67+
<p>
68+
{{ "IOTDEVICE.DOWNLINK.NOTIMPLEMENTED" | translate }}
69+
</p>
70+
</div>
71+
}
7072

7173
</div>
7274

0 commit comments

Comments
 (0)