roko.li/sharee.bike-App
5
0
Fork 0
mirror of https://dev.azure.com/TeilRad/sharee.bike%20App/_git/Code synced 2025-04-22 04:46:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

Code updated to 3.0.238

Browse source
This commit is contained in:
Oliver Hauff 2021-06-26 20:57:55 +02:00
parent 3302d80678
commit 9c6a1fa92b
257 changed files with 7763 additions and 2861 deletions
Download patch file Download diff file Expand all files Collapse all files

14
TINKLib/ViewModel/MyBikes/MyBikeViewModel.cs
View file

@ -12,7 +12,7 @@ namespace TINK.ViewModel
/// <returns>Display text</returns>
public string GetReservedInfo(
TimeSpan? remainingTime,
int? stationId = null,
string stationId = null,
string code = null)
{
if (remainingTime == null)
@ -38,20 +38,20 @@ namespace TINK.ViewModel
return string.Format(AppResources.StatusTextReservationExpiredCodeLocationMaxReservationTime, code, stationId, StateRequestedInfo.MaximumReserveTime.Minutes);
}
if (stationId.HasValue)
if (!string.IsNullOrEmpty(stationId))
{
if (!string.IsNullOrEmpty(code))
{
return string.Format(
AppResources.StatusTextReservationExpiredCodeLocationReservationTime,
code,
ViewModelHelper.GetStationName(stationId.Value),
ViewModelHelper.GetStationName(stationId),
remainingTime.Value.Minutes);
}
return string.Format(
AppResources.StatusTextReservationExpiredLocationReservationTime,
ViewModelHelper.GetStationName(stationId.Value),
ViewModelHelper.GetStationName(stationId),
remainingTime.Value.Minutes);
}
@ -67,7 +67,7 @@ namespace TINK.ViewModel
/// <returns>Display text</returns>
public string GetBookedInfo(
DateTime? from,
int? stationId = null,
string stationId = null,
string code = null)
{
if (from == null)
@ -77,12 +77,12 @@ namespace TINK.ViewModel
if (!string.IsNullOrEmpty(code))
{
if(stationId.HasValue)
if(!string.IsNullOrEmpty(stationId))
{
return string.Format(
AppResources.StatusTextBookedCodeLocationSince,
code,
ViewModelHelper.GetStationName(stationId.Value),
ViewModelHelper.GetStationName(stationId),
from.Value.ToString(BikeViewModelBase.TIMEFORMAT));
}