dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI: Updated file units models

Browse Source
This commit is contained in:
Vladyslav_Prykhodko 2023-07-20 11:16:28 +03:00
parent df9ec02bbc
commit 99a976b14e
2 changed files with 2014 additions and 2022 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui-ngx/src/app/shared/components/unit-input.component.ts
View File

@ -24,10 +24,6 @@ import { ResourcesService } from '@core/services/resources.service';
const unitsModels = '/assets/model/units.json'; const unitsModels = '/assets/model/units.json';
interface UnitsJson {
units: Array<Unit>;
}
@Component({ @Component({
selector: 'tb-unit-input', selector: 'tb-unit-input',
templateUrl: './unit-input.component.html', templateUrl: './unit-input.component.html',
@ -151,8 +147,8 @@ export class UnitInputComponent implements ControlValueAccessor, OnInit {
private unitsConstant(): Observable<Array<Unit>> { private unitsConstant(): Observable<Array<Unit>> {
if (this.fetchUnits$ === null) { if (this.fetchUnits$ === null) {
this.fetchUnits$ = this.resourcesService.loadJsonResource<UnitsJson>(unitsModels).pipe( this.fetchUnits$ = this.resourcesService.loadJsonResource<Array<Unit>>(unitsModels).pipe(
map(units => units.units.map(u => ({ map(units => units.map(u => ({
symbol: u.symbol, symbol: u.symbol,
name: this.translate.instant(u.name), name: this.translate.instant(u.name),
tags: u.tags tags: u.tags

8
ui-ngx/src/assets/model/units.json
View File

@ -1,6 +1,4 @@
{ [{
"units": [
{
"name": "unit.millimeter", "name": "unit.millimeter",
"symbol": "mm", "symbol": "mm",
"tags": ["level","height","distance","length","width","gap","depth","millimeter","millimeters","rainfall","precipitation", "tags": ["level","height","distance","length","width","gap","depth","millimeter","millimeters","rainfall","precipitation",
@ -2012,6 +2010,4 @@
"name": "unit.katal-per-cubic-metre", "name": "unit.katal-per-cubic-metre",
"symbol": "kat/m³", "symbol": "kat/m³",
"tags": ["catalytic activity concentration","enzyme concentration","kat/m³"] "tags": ["catalytic activity concentration","enzyme concentration","kat/m³"]
} }]
]
}