Skip to content

Commit

Permalink
Added not available text in table view
Browse files Browse the repository at this point in the history
  • Loading branch information
SheethalJR committed Aug 25, 2022
1 parent 9c2d742 commit f5d6679
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@

<ng-container matColumnDef="c8y_Notes">
<th mat-header-cell *matHeaderCellDef mat-sort-header> Notes </th>
<td mat-cell *matCellDef="let row"> {{row.c8y_Notes}} </td>
<td mat-cell *matCellDef="let row"> {{row.notes}} </td>
</ng-container>

<ng-container matColumnDef="type">
Expand Down
48 changes: 37 additions & 11 deletions projects/gp-asset-viewer/src/lib/gp-asset-viewer.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ export interface DeviceData {
creationTime?: string;
owner?: string;
childDeviceAvailable?: any;
notes?: any;
}

@Component({
Expand Down Expand Up @@ -408,41 +409,66 @@ export class GpAssetViewerComponent implements OnInit, OnDestroy {
deviceData.type = x.type;
deviceData.lastUpdated = x.lastUpdated;
deviceData.creationTime = x.creationTime;
deviceData.owner = x.owner ? x.owner : undefined;
deviceData.owner = x.owner ? x.owner : 'Not available';
if (x.childDeviceAvailable) {
deviceData.childDeviceAvailable = x.childDeviceAvailable;
}
if (x.deviceExternalDetails) {
deviceData.externalId = x.deviceExternalDetails.externalId;
deviceData.externalId = x.deviceExternalDetails.externalId ? x.deviceExternalDetails.externalId : 'Not available';
} else {
deviceData.externalId = 'Not available';
}
if (x.deviceExternalDetails) {
deviceData.externalType = x.deviceExternalDetails.externalType;
deviceData.externalType = x.deviceExternalDetails.externalType ? x.deviceExternalDetails.externalType : 'Not available';
} else {
deviceData.externalType = 'Not available';
}
if (x.c8y_RequiredAvailability) {
deviceData.responseInterval = x.c8y_RequiredAvailability.responseInterval;
deviceData.responseInterval = x.c8y_RequiredAvailability.responseInterval ? x.c8y_RequiredAvailability.responseInterval : 'Not available';
} else {
deviceData.responseInterval = 'Not available';
}
if (x.c8y_Connection) {
deviceData.connectionStatus = x.c8y_Connection.status;
deviceData.connectionStatus = x.c8y_Connection.status ? x.c8y_Connection.status : 'Not available';
} else {
deviceData.connectionStatus = 'Not available';
}
if (x.c8y_CommunicationMode) {
deviceData.communicationMode = x.c8y_CommunicationMode.mode;
deviceData.communicationMode = x.c8y_CommunicationMode.mode ? x.c8y_CommunicationMode.mode : 'Not availble';
} else {
deviceData.communicationMode = 'Not available';
}
if (x.c8y_Hardware) {
deviceData.hardwareModel = x.c8y_Hardware.model;
deviceData.hardwareModel = x.c8y_Hardware.model ? x.c8y_Hardware.model : 'Not available';
} else {
deviceData.hardwareModel = 'Not available';
}
if (x.c8y_Notes) {
deviceData.notes = x.c8y_Notes;
} else {
deviceData.notes = 'Not available';
}
if (this._config.selectedInputs) {
this._config.selectedInputs.forEach(element => {
if (x.c8y_Firmware && element === 'c8y_Firmware.version') {
deviceData.firmwareStatus = this.getFirmwareRiskForFilter(x.c8y_Firmware.version);
deviceData.firmwareStatus = x.c8y_Firmware.version ? this.getFirmwareRiskForFilter(x.c8y_Firmware.version) : 'Not available';
} else {
deviceData.firmwareStatus = 'Not available';
}
if (x.c8y_Firmware && element === 'c8y_Firmware.name') {
deviceData.firmwareName = x.c8y_Firmware.name;
deviceData.firmwareName = x.c8y_Firmware.name ? x.c8y_Firmware.name : 'Not available';
} else {
deviceData.firmwareName = 'Not available';
}
if (x.c8y_Firmware && element === 'c8y_Firmware.versionIssues') {
deviceData.firmwareVersionIssues = x.c8y_Firmware.versionIssues;
deviceData.firmwareVersionIssues = x.c8y_Firmware.versionIssues ? x.c8y_Firmware.versionIssues : 'Not available';
} else {
deviceData.firmwareVersionIssues = 'Not available';
}
if (x.c8y_Firmware && element === 'c8y_Firmware.versionIssuesName') {
deviceData.firmwareVersionIssuesName = x.c8y_Firmware.versionIssuesName;
deviceData.firmwareVersionIssuesName = x.c8y_Firmware.versionIssuesName ? x.c8y_Firmware.versionIssuesName : 'Not available';
} else {
deviceData.firmwareVersionIssuesName = 'Not available';
}
if (x.c8y_Availability && element === 'c8y_Availability.status') {
deviceData.availability = availability;
Expand Down

0 comments on commit f5d6679

Please sign in to comment.