From 039b30da4fbffe3f90b134a2fcf7615e56369eeb Mon Sep 17 00:00:00 2001 From: Scorpoon <22363852+scorpoon@users.noreply.github.com> Date: Sun, 10 Nov 2024 14:57:50 +0100 Subject: [PATCH 1/2] Optimized imports & removed redundant qualifiers --- Controllers/MigrationController.cs | 57 ++++++++++--------- Controllers/Vehicle/ImportController.cs | 3 +- .../Litedb/UserAccessDataAcces.cs | 1 - .../Litedb/VehicleDataAccess.cs | 1 - .../Postgres/UserAccessDataAcces.cs | 1 - Helper/ConfigHelper.cs | 5 +- Helper/MailHelper.cs | 3 +- Middleware/Authen.cs | 9 +-- Views/Shared/_Layout.cshtml | 7 ++- Views/Vehicle/_CollisionRecords.cshtml | 4 +- Views/Vehicle/_Gas.cshtml | 2 +- Views/Vehicle/_Notes.cshtml | 2 +- Views/Vehicle/_OdometerRecords.cshtml | 4 +- Views/Vehicle/_ReminderRecords.cshtml | 2 +- Views/Vehicle/_ServiceRecords.cshtml | 4 +- Views/Vehicle/_SupplyRecords.cshtml | 4 +- Views/Vehicle/_TaxRecords.cshtml | 4 +- Views/Vehicle/_UpgradeRecords.cshtml | 4 +- Views/Vehicle/_VehicleHistory.cshtml | 2 +- 19 files changed, 61 insertions(+), 58 deletions(-) diff --git a/Controllers/MigrationController.cs b/Controllers/MigrationController.cs index bfb872c..edfc2ba 100644 --- a/Controllers/MigrationController.cs +++ b/Controllers/MigrationController.cs @@ -5,6 +5,7 @@ using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Npgsql; using System.IO.Compression; +using JsonSerializer=System.Text.Json.JsonSerializer; namespace CarCareTracker.Controllers { @@ -105,7 +106,7 @@ namespace CarCareTracker.Controllers using (NpgsqlDataReader reader = ctext.ExecuteReader()) while (reader.Read()) { - Vehicle vehicle = System.Text.Json.JsonSerializer.Deserialize(reader["data"] as string); + Vehicle vehicle = JsonSerializer.Deserialize(reader["data"] as string); vehicles.Add(vehicle); } } @@ -123,7 +124,7 @@ namespace CarCareTracker.Controllers using (NpgsqlDataReader reader = ctext.ExecuteReader()) while (reader.Read()) { - repairrecords.Add(System.Text.Json.JsonSerializer.Deserialize(reader["data"] as string)); + repairrecords.Add(JsonSerializer.Deserialize(reader["data"] as string)); } } foreach (var record in repairrecords) @@ -140,7 +141,7 @@ namespace CarCareTracker.Controllers using (NpgsqlDataReader reader = ctext.ExecuteReader()) while (reader.Read()) { - upgraderecords.Add(System.Text.Json.JsonSerializer.Deserialize(reader["data"] as string)); + upgraderecords.Add(JsonSerializer.Deserialize(reader["data"] as string)); } } foreach (var record in upgraderecords) @@ -157,7 +158,7 @@ namespace CarCareTracker.Controllers using (NpgsqlDataReader reader = ctext.ExecuteReader()) while (reader.Read()) { - servicerecords.Add(System.Text.Json.JsonSerializer.Deserialize(reader["data"] as string)); + servicerecords.Add(JsonSerializer.Deserialize(reader["data"] as string)); } } foreach (var record in servicerecords) @@ -176,7 +177,7 @@ namespace CarCareTracker.Controllers using (NpgsqlDataReader reader = ctext.ExecuteReader()) while (reader.Read()) { - gasrecords.Add(System.Text.Json.JsonSerializer.Deserialize(reader["data"] as string)); + gasrecords.Add(JsonSerializer.Deserialize(reader["data"] as string)); } } foreach (var record in gasrecords) @@ -193,7 +194,7 @@ namespace CarCareTracker.Controllers using (NpgsqlDataReader reader = ctext.ExecuteReader()) while (reader.Read()) { - noterecords.Add(System.Text.Json.JsonSerializer.Deserialize(reader["data"] as string)); + noterecords.Add(JsonSerializer.Deserialize(reader["data"] as string)); } } foreach (var record in noterecords) @@ -210,7 +211,7 @@ namespace CarCareTracker.Controllers using (NpgsqlDataReader reader = ctext.ExecuteReader()) while (reader.Read()) { - odometerrecords.Add(System.Text.Json.JsonSerializer.Deserialize(reader["data"] as string)); + odometerrecords.Add(JsonSerializer.Deserialize(reader["data"] as string)); } } foreach (var record in odometerrecords) @@ -227,7 +228,7 @@ namespace CarCareTracker.Controllers using (NpgsqlDataReader reader = ctext.ExecuteReader()) while (reader.Read()) { - reminderrecords.Add(System.Text.Json.JsonSerializer.Deserialize(reader["data"] as string)); + reminderrecords.Add(JsonSerializer.Deserialize(reader["data"] as string)); } } foreach (var record in reminderrecords) @@ -246,7 +247,7 @@ namespace CarCareTracker.Controllers using (NpgsqlDataReader reader = ctext.ExecuteReader()) while (reader.Read()) { - planrecords.Add(System.Text.Json.JsonSerializer.Deserialize(reader["data"] as string)); + planrecords.Add(JsonSerializer.Deserialize(reader["data"] as string)); } } foreach (var record in planrecords) @@ -263,7 +264,7 @@ namespace CarCareTracker.Controllers using (NpgsqlDataReader reader = ctext.ExecuteReader()) while (reader.Read()) { - planrecordtemplates.Add(System.Text.Json.JsonSerializer.Deserialize(reader["data"] as string)); + planrecordtemplates.Add(JsonSerializer.Deserialize(reader["data"] as string)); } } foreach (var record in planrecordtemplates) @@ -280,7 +281,7 @@ namespace CarCareTracker.Controllers using (NpgsqlDataReader reader = ctext.ExecuteReader()) while (reader.Read()) { - supplyrecords.Add(System.Text.Json.JsonSerializer.Deserialize(reader["data"] as string)); + supplyrecords.Add(JsonSerializer.Deserialize(reader["data"] as string)); } } foreach (var record in supplyrecords) @@ -297,7 +298,7 @@ namespace CarCareTracker.Controllers using (NpgsqlDataReader reader = ctext.ExecuteReader()) while (reader.Read()) { - taxrecords.Add(System.Text.Json.JsonSerializer.Deserialize(reader["data"] as string)); + taxrecords.Add(JsonSerializer.Deserialize(reader["data"] as string)); } } foreach (var record in taxrecords) @@ -360,7 +361,7 @@ namespace CarCareTracker.Controllers using (NpgsqlDataReader reader = ctext.ExecuteReader()) while (reader.Read()) { - userconfigrecords.Add(System.Text.Json.JsonSerializer.Deserialize(reader["data"] as string)); + userconfigrecords.Add(JsonSerializer.Deserialize(reader["data"] as string)); } } foreach (var record in userconfigrecords) @@ -404,7 +405,7 @@ namespace CarCareTracker.Controllers using (NpgsqlDataReader reader = ctext.ExecuteReader()) while (reader.Read()) { - extrafields.Add(System.Text.Json.JsonSerializer.Deserialize(reader["data"] as string)); + extrafields.Add(JsonSerializer.Deserialize(reader["data"] as string)); } } foreach (var record in extrafields) @@ -475,7 +476,7 @@ namespace CarCareTracker.Controllers using (var ctext = pgDataSource.CreateCommand(cmd)) { ctext.Parameters.AddWithValue("id", vehicle.Id); - ctext.Parameters.AddWithValue("data", System.Text.Json.JsonSerializer.Serialize(vehicle)); + ctext.Parameters.AddWithValue("data", JsonSerializer.Serialize(vehicle)); ctext.ExecuteNonQuery(); } } @@ -491,7 +492,7 @@ namespace CarCareTracker.Controllers { ctext.Parameters.AddWithValue("id", record.Id); ctext.Parameters.AddWithValue("vehicleId", record.VehicleId); - ctext.Parameters.AddWithValue("data", System.Text.Json.JsonSerializer.Serialize(record)); + ctext.Parameters.AddWithValue("data", JsonSerializer.Serialize(record)); ctext.ExecuteNonQuery(); } } @@ -507,7 +508,7 @@ namespace CarCareTracker.Controllers { ctext.Parameters.AddWithValue("id", record.Id); ctext.Parameters.AddWithValue("vehicleId", record.VehicleId); - ctext.Parameters.AddWithValue("data", System.Text.Json.JsonSerializer.Serialize(record)); + ctext.Parameters.AddWithValue("data", JsonSerializer.Serialize(record)); ctext.ExecuteNonQuery(); } } @@ -523,7 +524,7 @@ namespace CarCareTracker.Controllers { ctext.Parameters.AddWithValue("id", record.Id); ctext.Parameters.AddWithValue("vehicleId", record.VehicleId); - ctext.Parameters.AddWithValue("data", System.Text.Json.JsonSerializer.Serialize(record)); + ctext.Parameters.AddWithValue("data", JsonSerializer.Serialize(record)); ctext.ExecuteNonQuery(); } } @@ -541,7 +542,7 @@ namespace CarCareTracker.Controllers { ctext.Parameters.AddWithValue("id", record.Id); ctext.Parameters.AddWithValue("vehicleId", record.VehicleId); - ctext.Parameters.AddWithValue("data", System.Text.Json.JsonSerializer.Serialize(record)); + ctext.Parameters.AddWithValue("data", JsonSerializer.Serialize(record)); ctext.ExecuteNonQuery(); } } @@ -557,7 +558,7 @@ namespace CarCareTracker.Controllers { ctext.Parameters.AddWithValue("id", record.Id); ctext.Parameters.AddWithValue("vehicleId", record.VehicleId); - ctext.Parameters.AddWithValue("data", System.Text.Json.JsonSerializer.Serialize(record)); + ctext.Parameters.AddWithValue("data", JsonSerializer.Serialize(record)); ctext.ExecuteNonQuery(); } } @@ -573,7 +574,7 @@ namespace CarCareTracker.Controllers { ctext.Parameters.AddWithValue("id", record.Id); ctext.Parameters.AddWithValue("vehicleId", record.VehicleId); - ctext.Parameters.AddWithValue("data", System.Text.Json.JsonSerializer.Serialize(record)); + ctext.Parameters.AddWithValue("data", JsonSerializer.Serialize(record)); ctext.ExecuteNonQuery(); } } @@ -589,7 +590,7 @@ namespace CarCareTracker.Controllers { ctext.Parameters.AddWithValue("id", record.Id); ctext.Parameters.AddWithValue("vehicleId", record.VehicleId); - ctext.Parameters.AddWithValue("data", System.Text.Json.JsonSerializer.Serialize(record)); + ctext.Parameters.AddWithValue("data", JsonSerializer.Serialize(record)); ctext.ExecuteNonQuery(); } } @@ -607,7 +608,7 @@ namespace CarCareTracker.Controllers { ctext.Parameters.AddWithValue("id", record.Id); ctext.Parameters.AddWithValue("vehicleId", record.VehicleId); - ctext.Parameters.AddWithValue("data", System.Text.Json.JsonSerializer.Serialize(record)); + ctext.Parameters.AddWithValue("data", JsonSerializer.Serialize(record)); ctext.ExecuteNonQuery(); } } @@ -623,7 +624,7 @@ namespace CarCareTracker.Controllers { ctext.Parameters.AddWithValue("id", record.Id); ctext.Parameters.AddWithValue("vehicleId", record.VehicleId); - ctext.Parameters.AddWithValue("data", System.Text.Json.JsonSerializer.Serialize(record)); + ctext.Parameters.AddWithValue("data", JsonSerializer.Serialize(record)); ctext.ExecuteNonQuery(); } } @@ -639,7 +640,7 @@ namespace CarCareTracker.Controllers { ctext.Parameters.AddWithValue("id", record.Id); ctext.Parameters.AddWithValue("vehicleId", record.VehicleId); - ctext.Parameters.AddWithValue("data", System.Text.Json.JsonSerializer.Serialize(record)); + ctext.Parameters.AddWithValue("data", JsonSerializer.Serialize(record)); ctext.ExecuteNonQuery(); } } @@ -655,7 +656,7 @@ namespace CarCareTracker.Controllers { ctext.Parameters.AddWithValue("id", record.Id); ctext.Parameters.AddWithValue("vehicleId", record.VehicleId); - ctext.Parameters.AddWithValue("data", System.Text.Json.JsonSerializer.Serialize(record)); + ctext.Parameters.AddWithValue("data", JsonSerializer.Serialize(record)); ctext.ExecuteNonQuery(); } } @@ -706,7 +707,7 @@ namespace CarCareTracker.Controllers using (var ctext = pgDataSource.CreateCommand(cmd)) { ctext.Parameters.AddWithValue("id", record.Id); - ctext.Parameters.AddWithValue("data", System.Text.Json.JsonSerializer.Serialize(record)); + ctext.Parameters.AddWithValue("data", JsonSerializer.Serialize(record)); ctext.ExecuteNonQuery(); } } @@ -738,7 +739,7 @@ namespace CarCareTracker.Controllers using (var ctext = pgDataSource.CreateCommand(cmd)) { ctext.Parameters.AddWithValue("id", record.Id); - ctext.Parameters.AddWithValue("data", System.Text.Json.JsonSerializer.Serialize(record)); + ctext.Parameters.AddWithValue("data", JsonSerializer.Serialize(record)); ctext.ExecuteNonQuery(); } } diff --git a/Controllers/Vehicle/ImportController.cs b/Controllers/Vehicle/ImportController.cs index b5c1956..8f8b4ac 100644 --- a/Controllers/Vehicle/ImportController.cs +++ b/Controllers/Vehicle/ImportController.cs @@ -3,6 +3,7 @@ using CarCareTracker.Helper; using CarCareTracker.MapProfile; using CarCareTracker.Models; using CsvHelper; +using CsvHelper.Configuration; using Microsoft.AspNetCore.Mvc; using System.Globalization; @@ -259,7 +260,7 @@ namespace CarCareTracker.Controllers { using (var reader = new StreamReader(fullFileName)) { - var config = new CsvHelper.Configuration.CsvConfiguration(CultureInfo.InvariantCulture); + var config = new CsvConfiguration(CultureInfo.InvariantCulture); config.MissingFieldFound = null; config.HeaderValidated = null; config.PrepareHeaderForMatch = args => { return args.Header.Trim().ToLower(); }; diff --git a/External/Implementations/Litedb/UserAccessDataAcces.cs b/External/Implementations/Litedb/UserAccessDataAcces.cs index 1120a4b..15fa08e 100644 --- a/External/Implementations/Litedb/UserAccessDataAcces.cs +++ b/External/Implementations/Litedb/UserAccessDataAcces.cs @@ -1,7 +1,6 @@ using CarCareTracker.External.Interfaces; using CarCareTracker.Helper; using CarCareTracker.Models; -using LiteDB; namespace CarCareTracker.External.Implementations { diff --git a/External/Implementations/Litedb/VehicleDataAccess.cs b/External/Implementations/Litedb/VehicleDataAccess.cs index d0ee18d..caeb4fd 100644 --- a/External/Implementations/Litedb/VehicleDataAccess.cs +++ b/External/Implementations/Litedb/VehicleDataAccess.cs @@ -1,7 +1,6 @@ using CarCareTracker.External.Interfaces; using CarCareTracker.Helper; using CarCareTracker.Models; -using LiteDB; namespace CarCareTracker.External.Implementations { diff --git a/External/Implementations/Postgres/UserAccessDataAcces.cs b/External/Implementations/Postgres/UserAccessDataAcces.cs index 3f4db7f..c497bc8 100644 --- a/External/Implementations/Postgres/UserAccessDataAcces.cs +++ b/External/Implementations/Postgres/UserAccessDataAcces.cs @@ -1,7 +1,6 @@ using CarCareTracker.External.Interfaces; using CarCareTracker.Models; using Npgsql; -using System.Net.Mail; namespace CarCareTracker.External.Implementations { diff --git a/Helper/ConfigHelper.cs b/Helper/ConfigHelper.cs index 2fa13cf..c54ef1c 100644 --- a/Helper/ConfigHelper.cs +++ b/Helper/ConfigHelper.cs @@ -2,6 +2,7 @@ using CarCareTracker.Models; using Microsoft.Extensions.Caching.Memory; using System.Security.Claims; +using System.Text.Json; namespace CarCareTracker.Helper { @@ -146,13 +147,13 @@ namespace CarCareTracker.Helper if (!File.Exists(StaticHelper.UserConfigPath)) { //if file doesn't exist it might be because it's running on a mounted volume in docker. - File.WriteAllText(StaticHelper.UserConfigPath, System.Text.Json.JsonSerializer.Serialize(new UserConfig())); + File.WriteAllText(StaticHelper.UserConfigPath, JsonSerializer.Serialize(new UserConfig())); } var configFileContents = File.ReadAllText(StaticHelper.UserConfigPath); configData.EnableAuth = bool.Parse(_config[nameof(UserConfig.EnableAuth)] ?? "false"); configData.UserNameHash = _config[nameof(UserConfig.UserNameHash)] ?? string.Empty; configData.UserPasswordHash = _config[nameof(UserConfig.UserPasswordHash)] ?? string.Empty; - File.WriteAllText(StaticHelper.UserConfigPath, System.Text.Json.JsonSerializer.Serialize(configData)); + File.WriteAllText(StaticHelper.UserConfigPath, JsonSerializer.Serialize(configData)); _cache.Set($"userConfig_{userId}", configData); return true; } diff --git a/Helper/MailHelper.cs b/Helper/MailHelper.cs index 65c0832..1cc1f4c 100644 --- a/Helper/MailHelper.cs +++ b/Helper/MailHelper.cs @@ -1,6 +1,7 @@ using CarCareTracker.Models; using MimeKit; using MailKit.Net.Smtp; +using MailKit.Security; namespace CarCareTracker.Helper { @@ -151,7 +152,7 @@ namespace CarCareTracker.Helper using (var client = new SmtpClient()) { - client.Connect(server, mailConfig.Port, MailKit.Security.SecureSocketOptions.Auto); + client.Connect(server, mailConfig.Port, SecureSocketOptions.Auto); //perform authentication if either username or password is provided. //do not perform authentication if neither are provided. if (!string.IsNullOrWhiteSpace(mailConfig.Username) || !string.IsNullOrWhiteSpace(mailConfig.Password)) { diff --git a/Middleware/Authen.cs b/Middleware/Authen.cs index c79fbff..ec05d97 100644 --- a/Middleware/Authen.cs +++ b/Middleware/Authen.cs @@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.DataProtection; using Microsoft.Extensions.Options; using System.Security.Claims; +using System.Text; using System.Text.Encodings.Web; using System.Text.Json; @@ -42,7 +43,7 @@ namespace CarCareTracker.Middleware new(ClaimTypes.Role, nameof(UserData.IsRootUser)) }; appIdentity.AddClaims(userIdentity); - AuthenticationTicket ticket = new AuthenticationTicket(new ClaimsPrincipal(appIdentity), this.Scheme.Name); + AuthenticationTicket ticket = new AuthenticationTicket(new ClaimsPrincipal(appIdentity), Scheme.Name); return AuthenticateResult.Success(ticket); } else @@ -59,7 +60,7 @@ namespace CarCareTracker.Middleware { var cleanedHeader = request_header.ToString().Replace("Basic ", "").Trim(); byte[] data = Convert.FromBase64String(cleanedHeader); - string decodedString = System.Text.Encoding.UTF8.GetString(data); + string decodedString = Encoding.UTF8.GetString(data); var splitString = decodedString.Split(":"); if (splitString.Count() != 2) { @@ -85,7 +86,7 @@ namespace CarCareTracker.Middleware userIdentity.Add(new(ClaimTypes.Role, nameof(UserData.IsRootUser))); } appIdentity.AddClaims(userIdentity); - AuthenticationTicket ticket = new AuthenticationTicket(new ClaimsPrincipal(appIdentity), this.Scheme.Name); + AuthenticationTicket ticket = new AuthenticationTicket(new ClaimsPrincipal(appIdentity), Scheme.Name); return AuthenticateResult.Success(ticket); } } @@ -133,7 +134,7 @@ namespace CarCareTracker.Middleware userIdentity.Add(new(ClaimTypes.Role, nameof(UserData.IsRootUser))); } appIdentity.AddClaims(userIdentity); - AuthenticationTicket ticket = new AuthenticationTicket(new ClaimsPrincipal(appIdentity), this.Scheme.Name); + AuthenticationTicket ticket = new AuthenticationTicket(new ClaimsPrincipal(appIdentity), Scheme.Name); return AuthenticateResult.Success(ticket); } } diff --git a/Views/Shared/_Layout.cshtml b/Views/Shared/_Layout.cshtml index 72c8a20..43c2773 100644 --- a/Views/Shared/_Layout.cshtml +++ b/Views/Shared/_Layout.cshtml @@ -1,4 +1,5 @@ @using CarCareTracker.Helper +@using System.Globalization @inject IConfigHelper config @inject ITranslationHelper translator @@ -11,9 +12,9 @@ var useMarkDown = userConfig.UseMarkDownOnSavedNotes; var useThreeDecimals = userConfig.UseThreeDecimalGasCost; var automaticDecimalFormat = userConfig.AutomaticDecimalFormat; - var shortDatePattern = System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern; - var firstDayOfWeek = (int)System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.FirstDayOfWeek; - var numberFormat = System.Globalization.CultureInfo.CurrentCulture.NumberFormat; + var shortDatePattern = CultureInfo.CurrentCulture.DateTimeFormat.ShortDatePattern; + var firstDayOfWeek = (int)CultureInfo.CurrentCulture.DateTimeFormat.FirstDayOfWeek; + var numberFormat = CultureInfo.CurrentCulture.NumberFormat; var userLanguage = userConfig.UserLanguage; shortDatePattern = shortDatePattern.ToLower(); if (!shortDatePattern.Contains("dd")) diff --git a/Views/Vehicle/_CollisionRecords.cshtml b/Views/Vehicle/_CollisionRecords.cshtml index fed1c57..f3bffd6 100644 --- a/Views/Vehicle/_CollisionRecords.cshtml +++ b/Views/Vehicle/_CollisionRecords.cshtml @@ -126,7 +126,7 @@ @(collisionRecord.Mileage == default ? "---" : collisionRecord.Mileage.ToString()) @collisionRecord.Description @((hideZero && collisionRecord.Cost == default) ? "---" : collisionRecord.Cost.ToString("C")) - @CarCareTracker.Helper.StaticHelper.TruncateStrings(collisionRecord.Notes) + @StaticHelper.TruncateStrings(collisionRecord.Notes) @foreach (string extraFieldColumn in extraFields) { @@ -134,7 +134,7 @@ var extraFieldValue = collisionRecord.ExtraFields.Where(x => x.Name == extraFieldColumn)?.FirstOrDefault()?.Value ?? ""; if (!string.IsNullOrWhiteSpace(extraFieldValue) && Uri.IsWellFormedUriString(extraFieldValue, UriKind.Absolute)) { - @CarCareTracker.Helper.StaticHelper.TruncateStrings(extraFieldValue) + @StaticHelper.TruncateStrings(extraFieldValue) } else { diff --git a/Views/Vehicle/_Gas.cshtml b/Views/Vehicle/_Gas.cshtml index 3b054cc..1478354 100644 --- a/Views/Vehicle/_Gas.cshtml +++ b/Views/Vehicle/_Gas.cshtml @@ -204,7 +204,7 @@ var extraFieldValue = gasRecord.ExtraFields.Where(x => x.Name == extraFieldColumn)?.FirstOrDefault()?.Value ?? ""; if (!string.IsNullOrWhiteSpace(extraFieldValue) && Uri.IsWellFormedUriString(extraFieldValue, UriKind.Absolute)) { - @CarCareTracker.Helper.StaticHelper.TruncateStrings(extraFieldValue) + @StaticHelper.TruncateStrings(extraFieldValue) } else { diff --git a/Views/Vehicle/_Notes.cshtml b/Views/Vehicle/_Notes.cshtml index 8cf03cc..bc56e47 100644 --- a/Views/Vehicle/_Notes.cshtml +++ b/Views/Vehicle/_Notes.cshtml @@ -52,7 +52,7 @@ { @note.Description } - @CarCareTracker.Helper.StaticHelper.TruncateStrings(note.NoteText, 100) + @StaticHelper.TruncateStrings(note.NoteText, 100) } diff --git a/Views/Vehicle/_OdometerRecords.cshtml b/Views/Vehicle/_OdometerRecords.cshtml index 60ec6e3..0691618 100644 --- a/Views/Vehicle/_OdometerRecords.cshtml +++ b/Views/Vehicle/_OdometerRecords.cshtml @@ -126,7 +126,7 @@ @odometerRecord.InitialMileage @odometerRecord.Mileage @(odometerRecord.DistanceTraveled == default ? "---" : odometerRecord.DistanceTraveled) - @CarCareTracker.Helper.StaticHelper.TruncateStrings(odometerRecord.Notes, 75) + @StaticHelper.TruncateStrings(odometerRecord.Notes, 75) @foreach (string extraFieldColumn in extraFields) { @@ -134,7 +134,7 @@ var extraFieldValue = odometerRecord.ExtraFields.Where(x => x.Name == extraFieldColumn)?.FirstOrDefault()?.Value ?? ""; if (!string.IsNullOrWhiteSpace(extraFieldValue) && Uri.IsWellFormedUriString(extraFieldValue, UriKind.Absolute)) { - @CarCareTracker.Helper.StaticHelper.TruncateStrings(extraFieldValue) + @StaticHelper.TruncateStrings(extraFieldValue) } else { diff --git a/Views/Vehicle/_ReminderRecords.cshtml b/Views/Vehicle/_ReminderRecords.cshtml index 34919bd..483858f 100644 --- a/Views/Vehicle/_ReminderRecords.cshtml +++ b/Views/Vehicle/_ReminderRecords.cshtml @@ -90,7 +90,7 @@ @reminderRecord.Description - @CarCareTracker.Helper.StaticHelper.TruncateStrings(reminderRecord.Notes) + @StaticHelper.TruncateStrings(reminderRecord.Notes) @if (hasRefresh) { diff --git a/Views/Vehicle/_ServiceRecords.cshtml b/Views/Vehicle/_ServiceRecords.cshtml index 00d71ca..2e632d8 100644 --- a/Views/Vehicle/_ServiceRecords.cshtml +++ b/Views/Vehicle/_ServiceRecords.cshtml @@ -126,14 +126,14 @@ @(serviceRecord.Mileage == default ? "---" : serviceRecord.Mileage.ToString()) @serviceRecord.Description @((hideZero && serviceRecord.Cost == default) ? "---" : serviceRecord.Cost.ToString("C")) - @CarCareTracker.Helper.StaticHelper.TruncateStrings(serviceRecord.Notes) + @StaticHelper.TruncateStrings(serviceRecord.Notes) @foreach (string extraFieldColumn in extraFields) { @{ var extraFieldValue = serviceRecord.ExtraFields.Where(x => x.Name == extraFieldColumn)?.FirstOrDefault()?.Value ?? ""; if (!string.IsNullOrWhiteSpace(extraFieldValue) && Uri.IsWellFormedUriString(extraFieldValue, UriKind.Absolute)){ - @CarCareTracker.Helper.StaticHelper.TruncateStrings(extraFieldValue) + @StaticHelper.TruncateStrings(extraFieldValue) } else { @extraFieldValue diff --git a/Views/Vehicle/_SupplyRecords.cshtml b/Views/Vehicle/_SupplyRecords.cshtml index ae51869..cbb6cac 100644 --- a/Views/Vehicle/_SupplyRecords.cshtml +++ b/Views/Vehicle/_SupplyRecords.cshtml @@ -142,7 +142,7 @@ @supplyRecord.Description @supplyRecord.Quantity @((hideZero && supplyRecord.Cost == default) ? "---" : supplyRecord.Cost.ToString("C")) - @CarCareTracker.Helper.StaticHelper.TruncateStrings(supplyRecord.Notes) + @StaticHelper.TruncateStrings(supplyRecord.Notes) @foreach (string extraFieldColumn in extraFields) { @@ -150,7 +150,7 @@ var extraFieldValue = supplyRecord.ExtraFields.Where(x => x.Name == extraFieldColumn)?.FirstOrDefault()?.Value ?? ""; if (!string.IsNullOrWhiteSpace(extraFieldValue) && Uri.IsWellFormedUriString(extraFieldValue, UriKind.Absolute)) { - @CarCareTracker.Helper.StaticHelper.TruncateStrings(extraFieldValue) + @StaticHelper.TruncateStrings(extraFieldValue) } else { diff --git a/Views/Vehicle/_TaxRecords.cshtml b/Views/Vehicle/_TaxRecords.cshtml index e7d3a5b..b081f15 100644 --- a/Views/Vehicle/_TaxRecords.cshtml +++ b/Views/Vehicle/_TaxRecords.cshtml @@ -118,7 +118,7 @@ @taxRecord.Date.ToShortDateString() @taxRecord.Description @((hideZero && taxRecord.Cost == default) ? "---" : taxRecord.Cost.ToString("C")) - @CarCareTracker.Helper.StaticHelper.TruncateStrings(taxRecord.Notes) + @StaticHelper.TruncateStrings(taxRecord.Notes) @foreach (string extraFieldColumn in extraFields) { @@ -126,7 +126,7 @@ var extraFieldValue = taxRecord.ExtraFields.Where(x => x.Name == extraFieldColumn)?.FirstOrDefault()?.Value ?? ""; if (!string.IsNullOrWhiteSpace(extraFieldValue) && Uri.IsWellFormedUriString(extraFieldValue, UriKind.Absolute)) { - @CarCareTracker.Helper.StaticHelper.TruncateStrings(extraFieldValue) + @StaticHelper.TruncateStrings(extraFieldValue) } else { diff --git a/Views/Vehicle/_UpgradeRecords.cshtml b/Views/Vehicle/_UpgradeRecords.cshtml index 6f5fa97..7bf74a8 100644 --- a/Views/Vehicle/_UpgradeRecords.cshtml +++ b/Views/Vehicle/_UpgradeRecords.cshtml @@ -126,7 +126,7 @@ @(upgradeRecord.Mileage == default ? "---" : upgradeRecord.Mileage.ToString()) @upgradeRecord.Description @((hideZero && upgradeRecord.Cost == default) ? "---" : upgradeRecord.Cost.ToString("C")) - @CarCareTracker.Helper.StaticHelper.TruncateStrings(upgradeRecord.Notes) + @StaticHelper.TruncateStrings(upgradeRecord.Notes) @foreach (string extraFieldColumn in extraFields) { @@ -134,7 +134,7 @@ var extraFieldValue = upgradeRecord.ExtraFields.Where(x => x.Name == extraFieldColumn)?.FirstOrDefault()?.Value ?? ""; if (!string.IsNullOrWhiteSpace(extraFieldValue) && Uri.IsWellFormedUriString(extraFieldValue, UriKind.Absolute)) { - @CarCareTracker.Helper.StaticHelper.TruncateStrings(extraFieldValue) + @StaticHelper.TruncateStrings(extraFieldValue) } else { diff --git a/Views/Vehicle/_VehicleHistory.cshtml b/Views/Vehicle/_VehicleHistory.cshtml index 36126d8..794e99f 100644 --- a/Views/Vehicle/_VehicleHistory.cshtml +++ b/Views/Vehicle/_VehicleHistory.cshtml @@ -141,7 +141,7 @@ @(reportData.Odometer == default ? "---" : reportData.Odometer.ToString("N0")) @reportData.Description @((hideZero && reportData.Cost == default) ? "---" : reportData.Cost.ToString("C")) - @CarCareTracker.Helper.StaticHelper.TruncateStrings(reportData.Notes, 100) + @StaticHelper.TruncateStrings(reportData.Notes, 100) } From 5b44f2ae33ed1850dd771bdbd00201073739ca58 Mon Sep 17 00:00:00 2001 From: Scorpoon <22363852+scorpoon@users.noreply.github.com> Date: Sun, 10 Nov 2024 15:09:19 +0100 Subject: [PATCH 2/2] Renamend UserAccessDataAcces.cs to UserAccessDataAccess.cs --- .../Postgres/{UserAccessDataAcces.cs => UserAccessDataAccess.cs} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename External/Implementations/Postgres/{UserAccessDataAcces.cs => UserAccessDataAccess.cs} (100%) diff --git a/External/Implementations/Postgres/UserAccessDataAcces.cs b/External/Implementations/Postgres/UserAccessDataAccess.cs similarity index 100% rename from External/Implementations/Postgres/UserAccessDataAcces.cs rename to External/Implementations/Postgres/UserAccessDataAccess.cs