Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LastActivityTime changed to StatusUpdatedTime #98

Merged
merged 1 commit into from
Jan 25, 2022
Merged

LastActivityTime changed to StatusUpdatedTime #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/AzureIoTHub.Portal/Client/Pages/Devices/DeviceDetailPage.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,10 @@
</MudItem>
<MudItem xs="12" Class="custom-form">
<MudItem md="3" sm="12">
<MudText>Last activity time : </MudText>
<MudText>Last status update : </MudText>
</MudItem>
<MudItem md="9" sm="12">
<MudTextField @bind-Value="@LastActivityDateString" Margin="Margin.Dense" Class="custom-disabled" ReadOnly="true" Variant="Variant.Outlined"></MudTextField>
<MudTextField @bind-Value="@StatusUpdatedTimeString" Margin="Margin.Dense" Class="custom-disabled" ReadOnly="true" Variant="Variant.Outlined"></MudTextField>
</MudItem>
</MudItem>
</MudItem>
Expand Down Expand Up @@ -174,7 +174,7 @@
private DeviceDetails Device { get; set; } = new DeviceDetails();

private bool success = true;
private string LastActivityDateString { get; set; }
private string StatusUpdatedTimeString { get; set; }

protected override async Task OnInitializedAsync()
{
Expand All @@ -187,8 +187,8 @@
DeviceModel model = await Http.GetFromJsonAsync<DeviceModel>($"api/DeviceModels/{Device.ModelId}");
Device.ModelName = model.Name;

// LastActivityDate set to string to have a more human-readable format
LastActivityDateString = Device.LastActivityDate.ToString();
// StatusUpdatedTime set to string to have a more human-readable format
StatusUpdatedTimeString = Device.StatusUpdatedTime.ToString();
}
catch (AccessTokenNotAvailableException exception)
{
Expand Down
4 changes: 2 additions & 2 deletions src/AzureIoTHub.Portal/Client/Pages/Devices/DeviceListPage.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@
<MudTh>Device</MudTh>
<MudTh Style="text-align: center">Status</MudTh>
<MudTh Style="text-align: center">Connection state</MudTh>
<MudTh Style="text-align: center">Last activity time</MudTh>
<MudTh Style="text-align: center">Last status update</MudTh>
<MudTh Style="text-align: center">See details</MudTh>
<MudTh Style="text-align: center">Delete</MudTh>
</HeaderContent>
Expand Down Expand Up @@ -136,7 +136,7 @@
<MudIcon Icon="@Icons.Filled.WifiOff" Color="Color.Error" />
}
</MudTd>
<MudTd DataLabel="LAT" Style="text-align: center">@context.LastActivityDate</MudTd>
<MudTd DataLabel="LSU" Style="text-align: center">@context.StatusUpdatedTime</MudTd>
<MudTd DataLabel="Details" Style="text-align: center">
<a href="devices/@context.DeviceID"><MudIconButton Icon="@Icons.Filled.Visibility" Color="Color.Default" /></a>
</MudTd>
Expand Down
4 changes: 2 additions & 2 deletions src/AzureIoTHub.Portal/Server/Mappers/DeviceTwinMapper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public DeviceDetails CreateDeviceDetails(Twin twin)
ImageUrl = this.deviceModelImageManager.ComputeImageUri(modelId),
IsConnected = twin.ConnectionState == DeviceConnectionState.Connected,
IsEnabled = twin.Status == DeviceStatus.Enabled,
LastActivityDate = twin.LastActivityTime.GetValueOrDefault(DateTime.MinValue),
StatusUpdatedTime = twin.StatusUpdatedTime.GetValueOrDefault(DateTime.MinValue),
AppEUI = Helpers.DeviceHelper.RetrievePropertyValue(twin, nameof(DeviceDetails.AppEUI)),
AppKey = Helpers.DeviceHelper.RetrievePropertyValue(twin, nameof(DeviceDetails.AppKey)),
LocationCode = Helpers.DeviceHelper.RetrieveTagValue(twin, nameof(DeviceDetails.LocationCode)),
Expand All @@ -57,7 +57,7 @@ public DeviceListItem CreateDeviceListItem(Twin twin)
IsConnected = twin.ConnectionState == DeviceConnectionState.Connected,
IsEnabled = twin.Status == DeviceStatus.Enabled,
LocationCode = Helpers.DeviceHelper.RetrieveTagValue(twin, nameof(DeviceDetails.LocationCode)),
LastActivityDate = twin.LastActivityTime.GetValueOrDefault(DateTime.MinValue)
StatusUpdatedTime = twin.StatusUpdatedTime.GetValueOrDefault(DateTime.MinValue)
};
}

Expand Down
2 changes: 1 addition & 1 deletion src/AzureIoTHub.Portal/Shared/Models/Device/DeviceDetails.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public class DeviceDetails

public bool IsEnabled { get; set; }

public DateTime LastActivityDate { get; set; }
public DateTime StatusUpdatedTime { get; set; }

public string AppEUI { get; set; }

Expand Down
2 changes: 1 addition & 1 deletion src/AzureIoTHub.Portal/Shared/Models/Device/DeviceListItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public class DeviceListItem

public bool IsEnabled { get; set; }

public DateTime LastActivityDate { get; set; }
public DateTime StatusUpdatedTime { get; set; }

public string AppEUI { get; set; }

Expand Down