Skip to content

Commit c52570f

Browse files
hargatahargata
authored
Merge pull request #1309 from hargata/Hargata/934
1.6.2 changes
2 parents 90cfb32 + c50c027 commit c52570f

21 files changed

Lines changed: 159 additions & 117 deletions

‎CarCareTracker.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<ItemGroup>
1010
<PackageReference Include="CsvHelper" Version="33.1.0" />
1111
<PackageReference Include="LiteDB" Version="5.0.17" />
12-
<PackageReference Include="MailKit" Version="4.14.1" />
13-
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.15.0" />
12+
<PackageReference Include="MailKit" Version="4.15.1" />
13+
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.16.0" />
1414
<PackageReference Include="Npgsql" Version="9.0.4" />
1515
</ItemGroup>
1616

‎Helper/StaticHelper.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace CarCareTracker.Helper
1414
/// </summary>
1515
public static class StaticHelper
1616
{
17-
public const string VersionNumber = "1.6.1";
17+
public const string VersionNumber = "1.6.2";
1818
public const string DbName = "data/cartracker.db";
1919
public const string UserConfigPath = "data/config/userConfig.json";
2020
public const string ServerConfigPath = "data/config/serverConfig.json";

‎Views/Login/ForgotPassword.cshtml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
@section Scripts {
1111
<script src="~/js/login.js?v=@StaticHelper.VersionNumber"></script>
1212
}
13-
<div class="no-top-pad container d-flex align-items-center justify-content-center" style="height:100vh">
14-
<div>
13+
<div class="no-top-pad container d-flex align-items-center justify-content-center" style="height:100dvh">
14+
<div class="border rounded shadow p-5">
1515
<div style="max-width:204px;">
1616
<img src="@config.GetLogoUrl()" class="lubelogger-logo" />
1717
<div class="form-group">

‎Views/Login/Index.cshtml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
@section Scripts {
1414
<script src="~/js/login.js?v=@StaticHelper.VersionNumber"></script>
1515
}
16-
<div class="no-top-pad container d-flex align-items-center justify-content-center" style="height:100vh">
17-
<div>
16+
<div class="no-top-pad container d-flex align-items-center justify-content-center" style="height:100dvh">
17+
<div class="border rounded shadow p-5">
1818
<div style="max-width:204px;">
1919
<img src="@config.GetLogoUrl()" class="lubelogger-logo" />
2020
<div class="form-group">

‎Views/Login/OpenIDRegistration.cshtml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
@section Scripts {
1313
<script src="~/js/login.js?v=@StaticHelper.VersionNumber"></script>
1414
}
15-
<div class="no-top-pad container d-flex align-items-center justify-content-center" style="height:100vh">
16-
<div>
15+
<div class="no-top-pad container d-flex align-items-center justify-content-center" style="height:100dvh">
16+
<div class="border rounded shadow p-5">
1717
<div style="max-width:204px;">
1818
<img src="@config.GetLogoUrl()" class="lubelogger-logo" />
1919
<div class="form-group">

‎Views/Login/Registration.cshtml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
@section Scripts {
1313
<script src="~/js/login.js?v=@StaticHelper.VersionNumber"></script>
1414
}
15-
<div class="no-top-pad container d-flex align-items-center justify-content-center" style="height:100vh">
16-
<div>
15+
<div class="no-top-pad container d-flex align-items-center justify-content-center" style="height:100dvh">
16+
<div class="border rounded shadow p-5">
1717
<div style="max-width:204px;">
1818
<img src="@config.GetLogoUrl()" class="lubelogger-logo" />
1919
<div class="form-group">

‎Views/Login/ResetPassword.cshtml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
@section Scripts {
1212
<script src="~/js/login.js?v=@StaticHelper.VersionNumber"></script>
1313
}
14-
<div class="no-top-pad container d-flex align-items-center justify-content-center" style="height:100vh">
15-
<div>
14+
<div class="no-top-pad container d-flex align-items-center justify-content-center" style="height:100dvh">
15+
<div class="border rounded shadow p-5">
1616
<div style="max-width:204px;">
1717
<img src="@config.GetLogoUrl()" class="lubelogger-logo" />
1818
<div class="form-group">

‎Views/Vehicle/Collision/_CollisionRecords.cshtml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@
114114
<img src="@config.GetLogoUrl()" class="lubelogger-logo" />
115115
</div>
116116
</div>
117-
<table class="table table-hover">
117+
<table class="table table-hover ll-responsive-table">
118118
<thead class="sticky-top">
119119
<tr class="d-flex">
120120
<th scope="col" class="col-2 col-xl-1 flex-grow-1 text-truncate" data-column="date">@translator.Translate(userLanguage, "Date")</th>
@@ -133,15 +133,15 @@
133133
@foreach (CollisionRecord collisionRecord in Model)
134134
{
135135
<tr class="d-flex user-select-none" style="cursor:pointer;" onmouseup="stopEvent()" ontouchstart="detectRowLongTouch(this)" ontouchend="detectRowTouchEndPremature(this)" data-rowId="@collisionRecord.Id" oncontextmenu="showTableContextMenu(this)" onmousemove="rangeMouseMove(this)" onclick="handleTableRowClick(this, showEditCollisionRecordModal,@collisionRecord.Id)" data-tags='@string.Join(" ", collisionRecord.Tags)'>
136-
<td class="col-2 col-xl-1 flex-grow-1 text-truncate" data-column="date" data-date="@StaticHelper.GetEpochFromDateTime(collisionRecord.Date)">@collisionRecord.Date.ToShortDateString()</td>
137-
<td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" data-column="odometer">@(collisionRecord.Mileage == default ? "---" : collisionRecord.Mileage.ToString())</td>
138-
<td class="col-3 col-xl-4 flex-grow-1 flex-shrink-1 text-truncate" data-column="description">@collisionRecord.Description</td>
139-
<td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" data-column="cost" data-record-type="cost">@(StaticHelper.HideZeroCost(collisionRecord.Cost, hideZero))</td>
140-
<td class="col-1 flex-grow-1 flex-shrink-1 text-truncate" style='display:none;' data-column="attachments">@await Html.PartialAsync("_AttachmentColumn", collisionRecord.Files)</td>
141-
<td class="col-3 flex-grow-1 flex-shrink-1 text-truncate" data-column="notes">@StaticHelper.TruncateStrings(collisionRecord.Notes)</td>
136+
<td data-label="@translator.Translate(userLanguage, "Date")" class="col-2 col-xl-1 flex-grow-1 text-truncate" data-column="date" data-date="@StaticHelper.GetEpochFromDateTime(collisionRecord.Date)">@collisionRecord.Date.ToShortDateString()</td>
137+
<td data-label="@translator.Translate(userLanguage, "Odometer")" class="col-2 flex-grow-1 flex-shrink-1 text-truncate" data-column="odometer">@(collisionRecord.Mileage == default ? "---" : collisionRecord.Mileage.ToString())</td>
138+
<td data-label="@translator.Translate(userLanguage, "Description")" class="col-3 col-xl-4 flex-grow-1 flex-shrink-1 text-truncate" data-column="description">@collisionRecord.Description</td>
139+
<td data-label="@translator.Translate(userLanguage, "Cost")" class="col-2 flex-grow-1 flex-shrink-1 text-truncate" data-column="cost" data-record-type="cost">@(StaticHelper.HideZeroCost(collisionRecord.Cost, hideZero))</td>
140+
<td data-label="@translator.Translate(userLanguage, "Attachments")" class="col-1 flex-grow-1 flex-shrink-1 text-truncate" style='display:none;' data-column="attachments">@await Html.PartialAsync("_AttachmentColumn", collisionRecord.Files)</td>
141+
<td data-label="@translator.Translate(userLanguage, "Notes")" class="col-3 flex-grow-1 flex-shrink-1 text-truncate" data-column="notes">@StaticHelper.TruncateStrings(collisionRecord.Notes)</td>
142142
@foreach (string extraFieldColumn in extraFields)
143143
{
144-
<td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" style='display:none;' data-column="@extraFieldColumn">
144+
<td data-label="@extraFieldColumn" class="col-2 flex-grow-1 flex-shrink-1 text-truncate" style='display:none;' data-column="@extraFieldColumn">
145145
@{
146146
var extraFieldValue = collisionRecord.ExtraFields.Where(x => x.Name == extraFieldColumn)?.FirstOrDefault()?.Value ?? "";
147147
if (!string.IsNullOrWhiteSpace(extraFieldValue) && Uri.IsWellFormedUriString(extraFieldValue, UriKind.Absolute))
@@ -171,7 +171,7 @@
171171
<div class="row lubelogger-record-nav pt-1 hideOnPrint">
172172
<div class="d-flex justify-content-between">
173173
<button onclick="toggleSelectMode(this)" class="btn btn-outline-secondary btn-md mt-1 mb-1 select-mode-toggle"><i class="bi bi-check2-square"></i></button>
174-
<button onclick="showAddCollisionRecordModal()" class="btn btn-outline-primary btn-md mt-1 mb-1"><i class="bi bi-plus-lg"></i></button>
174+
<button onclick="showAddCollisionRecordModal()" class="btn btn-primary btn-md mt-1 mb-1"><i class="bi bi-plus-lg"></i></button>
175175
<div>
176176
<button class="btn btn-outline-secondary btn-md mt-1 mb-1" onclick="showDropDownForRecordNav(this)" data-bs-toggle="dropdown" aria-expanded="false"><i class="bi bi-three-dots"></i></button>
177177
<ul class="dropdown-menu record-dropdown">

‎Views/Vehicle/Equipment/_EquipmentRecords.cshtml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
<img src="@config.GetLogoUrl()" class="lubelogger-logo" />
108108
</div>
109109
</div>
110-
<table class="table table-hover">
110+
<table class="table table-hover ll-responsive-table">
111111
<thead class="sticky-top">
112112
<tr class="d-flex">
113113
<th scope="col" class="col-3 col-xl-4 flex-grow-1 flex-shrink-1 text-truncate" data-column="description">@translator.Translate(userLanguage, "Description")</th>
@@ -125,14 +125,14 @@
125125
@foreach (EquipmentRecordViewModel equipmentRecord in Model)
126126
{
127127
<tr class="d-flex user-select-none" style="cursor:pointer;" onmouseup="stopEvent()" ontouchstart="detectRowLongTouch(this)" ontouchend="detectRowTouchEndPremature(this)" data-rowId="@equipmentRecord.Id" oncontextmenu="showTableContextMenu(this)" onmousemove="rangeMouseMove(this)" onclick="handleTableRowClick(this, showEditEquipmentRecordModal,@equipmentRecord.Id)" data-tags='@string.Join(" ", equipmentRecord.Tags)'>
128-
<td class="col-3 col-xl-4 flex-grow-1 flex-shrink-1 text-truncate" data-column="description" data-record-type="cost">@equipmentRecord.Description</td>
129-
<td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" data-column="equipped"><i class="bi bi-check-lg @(equipmentRecord.IsEquipped ? "" : "d-none")"></i></td>
130-
<td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" data-column="distance">@(equipmentRecord.DistanceTraveled == default ? "---" : equipmentRecord.DistanceTraveled)</td>
131-
<td class="col-1 flex-grow-1 flex-shrink-1 text-truncate" style='display:none;' data-column="attachments">@await Html.PartialAsync("_AttachmentColumn", equipmentRecord.Files)</td>
132-
<td class="col-3 flex-grow-1 flex-shrink-1 text-truncate" data-column="notes">@StaticHelper.TruncateStrings(equipmentRecord.Notes)</td>
128+
<td data-label="@translator.Translate(userLanguage, "Description")" class="col-3 col-xl-4 flex-grow-1 flex-shrink-1 text-truncate" data-column="description" data-record-type="cost">@equipmentRecord.Description</td>
129+
<td data-label="@translator.Translate(userLanguage, "Equipped")" class="col-2 flex-grow-1 flex-shrink-1 text-truncate" data-column="equipped"><i class="bi bi-check-lg @(equipmentRecord.IsEquipped ? "" : "d-none")"></i></td>
130+
<td data-label="@translator.Translate(userLanguage, "Distance")" class="col-2 flex-grow-1 flex-shrink-1 text-truncate" data-column="distance">@(equipmentRecord.DistanceTraveled == default ? "---" : equipmentRecord.DistanceTraveled)</td>
131+
<td data-label="@translator.Translate(userLanguage, "Attachments")" class="col-1 flex-grow-1 flex-shrink-1 text-truncate" style='display:none;' data-column="attachments">@await Html.PartialAsync("_AttachmentColumn", equipmentRecord.Files)</td>
132+
<td data-label="@translator.Translate(userLanguage, "Notes")" class="col-3 flex-grow-1 flex-shrink-1 text-truncate" data-column="notes">@StaticHelper.TruncateStrings(equipmentRecord.Notes)</td>
133133
@foreach (string extraFieldColumn in extraFields)
134134
{
135-
<td class="col-2 flex-grow-1 flex-shrink-1 text-truncate" style='display:none;' data-column="@extraFieldColumn">
135+
<td data-label="@extraFieldColumn" class="col-2 flex-grow-1 flex-shrink-1 text-truncate" style='display:none;' data-column="@extraFieldColumn">
136136
@{
137137
var extraFieldValue = equipmentRecord.ExtraFields.Where(x => x.Name == extraFieldColumn)?.FirstOrDefault()?.Value ?? "";
138138
if (!string.IsNullOrWhiteSpace(extraFieldValue) && Uri.IsWellFormedUriString(extraFieldValue, UriKind.Absolute))
@@ -162,7 +162,7 @@
162162
<div class="row lubelogger-record-nav pt-1 hideOnPrint">
163163
<div class="d-flex justify-content-between">
164164
<button onclick="toggleSelectMode(this)" class="btn btn-outline-secondary btn-md mt-1 mb-1 select-mode-toggle"><i class="bi bi-check2-square"></i></button>
165-
<button onclick="showAddEquipmentRecordModal()" class="btn btn-outline-primary btn-md mt-1 mb-1"><i class="bi bi-plus-lg"></i></button>
165+
<button onclick="showAddEquipmentRecordModal()" class="btn btn-primary btn-md mt-1 mb-1"><i class="bi bi-plus-lg"></i></button>
166166
<div>
167167
<button class="btn btn-outline-secondary btn-md mt-1 mb-1" onclick="showDropDownForRecordNav(this)" data-bs-toggle="dropdown" aria-expanded="false"><i class="bi bi-three-dots"></i></button>
168168
<ul class="dropdown-menu record-dropdown">

0 commit comments

Comments
 (0)