Skip to content

Commit a536497

Browse files
committed
IOT-27 add datapackage to iot-device-detail
1 parent a8cab11 commit a536497

File tree

7 files changed

+47
-5
lines changed

7 files changed

+47
-5
lines changed

src/app/my-applications/iot-devices/iot-device-detail/iot-device-detail.component.html

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,33 @@ <h4>{{ 'IOTDEVICE.LORA.SKIPFCNTCHECK' | translate }}</h4>
146146
</div>
147147
</div>
148148
</ng-container>
149+
<div class="col-12 py-4">
150+
<mat-expansion-panel>
151+
<mat-expansion-panel-header>
152+
<mat-panel-title>
153+
<ng-container *ngIf="device.latestReceivedMessage?.sentTime; then sentTime; else noSentTime">
154+
</ng-container>
155+
<ng-template #sentTime>
156+
<p>
157+
{{'IOTDEVICE.LATEST-DATAPACKAGE' | translate}} {{device.latestReceivedMessage?.sentTime | date:'medium'}}
158+
</p>
159+
</ng-template>
160+
<ng-template #noSentTime>
161+
<p>
162+
{{'IOTDEVICE.NO-DATAPACKAGE' | translate}}
163+
</p>
164+
</ng-template>
165+
</mat-panel-title>
166+
</mat-expansion-panel-header>
167+
<ng-container *ngIf="device.latestReceivedMessage?.rawData">
168+
<code>
169+
<pre>
170+
{{device.latestReceivedMessage.rawData | json }}
171+
</pre>
172+
</code>
173+
</ng-container>
174+
</mat-expansion-panel>
175+
</div>
149176
</div>
150177
<ng-container *ngIf="device.type">
151178
<div class="col-12 py-4">

src/app/my-applications/iot-devices/iot-device.model.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { JsonLocation } from 'src/app/models/Json-location';
33
import { LorawanSettings } from 'src/app/models/lorawan-settings';
44
import { ReceivedMessageMetadata } from 'src/app/models/received-message-metadata';
55
import { DeviceType } from 'src/app/shared/enums/device-type';
6+
import { LatestReceivedMessage } from './latestReceivedMessage.model';
67

78
export class IotDevice {
89
name: string;
@@ -20,6 +21,7 @@ export class IotDevice {
2021
applicationId: number;
2122
longitude = 0;
2223
latitude = 0;
24+
latestReceivedMessage: LatestReceivedMessage;
2325
lorawanSettings = new LorawanSettings();
2426
}
2527

src/app/my-applications/iot-devices/iot-device.service.ts

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,24 @@ import { RestService } from 'src/app/shared/services/rest.service';
77
providedIn: 'root',
88
})
99
export class IoTDeviceService {
10+
11+
private BASEURL = 'iot-device';
12+
1013
constructor(private restService: RestService) { }
1114

1215
createIoTDevice(body: IotDevice): Observable<IotDeviceData> {
13-
return this.restService.post('iot-device', body);
16+
return this.restService.post(this.BASEURL, body);
1417
}
1518

1619
updateIoTDevice(body: IotDevice, id: number): Observable<IotDeviceData> {
17-
return this.restService.put('iot-device', body, id, { observe: 'response' });
20+
return this.restService.put(this.BASEURL, body, id, { observe: 'response' });
1821
}
1922

2023
getIoTDevice(id: number): Observable<IotDevice> {
21-
return this.restService.get('iot-device', {}, id);
24+
return this.restService.get(this.BASEURL, {}, id);
2225
}
2326

2427
deleteIoTDevice(id: number) {
25-
return this.restService.delete('iot-device', id);
28+
return this.restService.delete(this.BASEURL, id);
2629
}
2730
}

src/app/my-applications/iot-devices/iot-devices-table-row/iot-devices-table-row.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export class IotDevicesTableRowComponent implements OnInit {
2323
private router: Router
2424
) {
2525
translate.use('da');
26-
moment.locale('da')
26+
moment.locale('da');
2727
}
2828

2929
ngOnInit(): void { }

src/app/my-applications/iot-devices/iot-devices.module.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import { IotDevicesListComponent } from './iot-devices-list/iot-devices-list.com
1212
import { IoTDeviceDetailComponent } from './iot-device-detail/iot-device-detail.component';
1313
import { IotDeviceEditComponent } from './iot-device-edit/iot-device-edit.component';
1414
import { FormModule } from 'src/app/shared/form/form.module';
15+
import { NGMaterialModule } from '@shared/Modules/materiale.module';
1516

1617
@NgModule({
1718
declarations: [
@@ -33,6 +34,7 @@ import { FormModule } from 'src/app/shared/form/form.module';
3334
RouterModule,
3435
TranslateModule,
3536
FormModule,
37+
NGMaterialModule
3638
],
3739
})
3840
export class IotDevicesModule { }
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
export interface LatestReceivedMessage {
2+
createdAt: Date;
3+
updatedAt: Date;
4+
rawData: JSON;
5+
sentTime: Date;
6+
}

src/assets/i18n/da.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,8 @@
314314
"INSTRUCTIONS": "Du kalder denne url:"
315315
},
316316
"LORAWANSETUP": "LoRaWAN Specifik opsætning",
317+
"LATEST-DATAPACKAGE": "Seneste datapakke sendt fra enheden:",
318+
"NO-DATAPACKAGE": "Der er ikke modtaget nogle datapakker",
317319
"LORA": {
318320
"DEVEUI": "Enheds EUI",
319321
"SERVICEPROFILE": "Service profil",

0 commit comments

Comments
 (0)