multiple bugfixes from 20 Apr 2020 to 7 jan 2023
This commit is contained in:
parent
902e04c7e6
commit
63d062c4a7
122 changed files with 13163 additions and 12361 deletions
|
|
@ -261,7 +261,7 @@
|
|||
<tbody style="cursor: pointer;">
|
||||
<tr *ngFor="let device of deviceData | orderBy: key : reverse | filter:myInput ;let i = index" >
|
||||
|
||||
<td>
|
||||
<td>
|
||||
<div *ngIf="iconCheck(device.status,device.iconType)">
|
||||
<img *ngIf="device.iconType === 'jcb'" width ='30px' style="margin-left: 10px;" src={{devIcon}}>
|
||||
<img *ngIf="device.iconType != 'jcb'" width ='20px' style="margin-left: 10px;" src={{devIcon}}>
|
||||
|
|
@ -286,15 +286,15 @@
|
|||
</td>
|
||||
<td (click)="vewdev(device.Device_ID,device.Device_Name,device.type_of_device,device.expiration_date,device.last_speed,device.status)">{{device.total_odo
|
||||
? (device.total_odo | number: '1.2-2' ): 0}}</td>
|
||||
<td >
|
||||
<td style="width:200px">
|
||||
<div style="cursor: pointer;">
|
||||
<!-- title="update Address" (click)="updateAddress(device)" -->
|
||||
<!-- <img style="width: 20px;" src='../../assets/image/addressICON.png' (click)=getAddress(device) md-tooltip="Click to get device's last location"> -->
|
||||
|
||||
<div >
|
||||
<span md-tooltip="Device's last location" *ngIf="device.locationAddress!=null">{{device.locationAddress}}</span>
|
||||
<span style="text-align: center;" md-tooltip="Device's last location" *ngIf="device.locationAddress==null">
|
||||
<img style="width: 20px;" src='../../assets/image/addressICON.png' (click)=getAddress(device)
|
||||
<div style="text-align: center;" >
|
||||
<span style="text-align: center;" md-tooltip="Device's last location" *ngIf="device.locationAddress">{{device.locationAddress}}</span>
|
||||
<span style="text-align: start;" *ngIf="!device.locationAddress">
|
||||
<img style="width: 20px;" src='../../assets/image/addressICON.png' (click)=getAddress(device,true)
|
||||
md-tooltip="Click to get device's last location">
|
||||
</span>
|
||||
<i *ngIf="(device.pen)" style="cursor: pointer;color:gray" class="fas fa-pen" title="update Address" (click)="updateAddress(device)"></i>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue