Merge pull request #1040 from hargata/Hargata/1039

use culture invariant when converting opacity to string.

Author: hargata

Helper/FileHelper.cs

@@ -1,4 +1,6 @@
 using CarCareTracker.Models;
+using CsvHelper;
+using System.Globalization;
 using System.IO.Compression;
 
 namespace CarCareTracker.Helper
@@ -241,14 +243,41 @@ public string MakeAttachmentsExport(List<GenericReportModel> exportData)
             if (!Directory.Exists(tempPath))
                 Directory.CreateDirectory(tempPath);
             int fileIndex = 0;
+            List<AttachmentExportModel> urlAttachments = new List<AttachmentExportModel>();
             foreach (GenericReportModel reportModel in exportData)
             {
                 foreach (UploadedFiles file in reportModel.Files)
                 {
                     var fileToCopy = GetFullFilePath(file.Location);
                     var destFileName = $"{tempPath}/{fileIndex}_{reportModel.DataType}_{reportModel.Date.ToString("yyyy-MM-dd")}_{file.Name}{Path.GetExtension(file.Location)}";
-                    File.Copy(fileToCopy, destFileName);
-                    fileIndex++;
+                    if (File.Exists(fileToCopy))
+                    {
+                        File.Copy(fileToCopy, destFileName);
+                        fileIndex++;
+                    } else
+                    {
+                        //file not found, must be a URL
+                        urlAttachments.Add(new AttachmentExportModel { 
+                            DataType = reportModel.DataType.ToString(),
+                            Date = reportModel.Date.ToString("yyyy-MM-dd"),
+                            Name = file.Name,
+                            Location = file.Location
+                        });
+                    }
+                }
+            }
+            if (urlAttachments.Any())
+            {
+                //write csv file detailing all urls.
+                var destFileName = $"{tempPath}/link_attachments.csv";
+                using (var writer = new StreamWriter(destFileName))
+                {
+                    using (var csv = new CsvWriter(writer, CultureInfo.InvariantCulture))
+                    {
+                        //custom writer
+                        StaticHelper.WriteAttachmentExportModel(csv, urlAttachments);
+                    }
+                    writer.Dispose();
                 }
             }
             var destFilePath = $"{tempPath}.zip";

Helper/StaticHelper.cs

@@ -12,7 +12,7 @@ namespace CarCareTracker.Helper
     /// </summary>
     public static class StaticHelper
     {
-        public const string VersionNumber = "1.5.0";
+        public const string VersionNumber = "1.5.1";
         public const string DbName = "data/cartracker.db";
         public const string UserConfigPath = "data/config/userConfig.json";
         public const string ServerConfigPath = "data/config/serverConfig.json";
@@ -709,6 +709,23 @@ public static void WritePlanRecordExportModel(CsvWriter _csv, IEnumerable<PlanRe
                 _csv.NextRecord();
             }
         }
+        public static void WriteAttachmentExportModel(CsvWriter _csv, IEnumerable<AttachmentExportModel> genericRecords)
+        {
+            //write headers
+            _csv.WriteField(nameof(AttachmentExportModel.DataType));
+            _csv.WriteField(nameof(AttachmentExportModel.Date));
+            _csv.WriteField(nameof(AttachmentExportModel.Name));
+            _csv.WriteField(nameof(AttachmentExportModel.Location));
+            _csv.NextRecord();
+            foreach (AttachmentExportModel genericRecord in genericRecords)
+            {
+                _csv.WriteField(genericRecord.DataType);
+                _csv.WriteField(genericRecord.Date);
+                _csv.WriteField(genericRecord.Name);
+                _csv.WriteField(genericRecord.Location);
+                _csv.NextRecord();
+            }
+        }
         public static string HideZeroCost(string input, bool hideZero, string decorations = "")
         {
             if (input == 0M.ToString("C2") && hideZero)

Models/Shared/ImportModel.cs

@@ -176,4 +176,11 @@ public class UserExportModel
         [JsonConverter(typeof(FromBoolOptional))]
         public string IsRoot { get; set; }
     }
+    public class AttachmentExportModel
+    {
+        public string DataType { get; set; }
+        public string Date { get; set; }
+        public string Name { get; set; }
+        public string Location { get; set; }
+    }
 }

Views/Vehicle/Index.cshtml

@@ -187,11 +187,11 @@
                     <button type="button" class="btn btn-outline-secondary" onclick="performGlobalSearch()"><i class="bi bi-search"></i></button>
                 </div>
                 <div class="form-check form-check-inline form-switch mt-1">
-                    <input class="form-check-input" type="checkbox" role="switch" id="globalSearchAutoSearchCheck" checked>
+                    <input class="form-check-input" type="checkbox" role="switch" onchange="saveGlobalSearchSettings()" id="globalSearchAutoSearchCheck" checked>
                     <label class="form-check-label" for="globalSearchAutoSearchCheck">@translator.Translate(userLanguage, "Incremental Search")</label>
                 </div>
                 <div class="form-check form-check-inline form-switch mt-1">
-                    <input class="form-check-input" type="checkbox" onChange="performGlobalSearch()" role="switch" id="globalSearchCaseSensitiveCheck" checked>
+                    <input class="form-check-input" type="checkbox" onchange="performGlobalSearch()" role="switch" id="globalSearchCaseSensitiveCheck" checked>
                     <label class="form-check-label" for="globalSearchCaseSensitiveCheck">@translator.Translate(userLanguage, "Case Sensitive")</label>
                 </div>
                 <div id="globalSearchModalResults"></div>

Views/Vehicle/Plan/_PlanRecordItem.cshtml

@@ -1,4 +1,10 @@
-@model PlanRecord
+@using CarCareTracker.Helper
+@inject IConfigHelper config
+@{
+    var userConfig = config.GetUserConfig(User);
+    var hideZero = userConfig.HideZero;
+}
+@model PlanRecord
 <div class="taskCard @(Model.Progress == PlanProgress.Done ? "nodrag" : "") text-dark user-select-none mt-2 mb-2" draggable="@(Model.Progress == PlanProgress.Done ? "false" : "true")" ondragstart="dragStart(event, @Model.Id)" onclick="@(Model.Progress == PlanProgress.Done ? $"deletePlanRecord({Model.Id}, true)" : $"showEditPlanRecordModal({Model.Id})")" oncontextmenu="@($"showPlanTableContextMenu(this, {Model.Id}, '{Model.Progress}')")" onmouseup="stopEvent()" ontouchstart="detectPlanItemLongTouch(this, @Model.Id, '@Model.Progress')" ontouchend="detectPlanItemTouchEndPremature(this)">
     <div class="card-body">
         <div class="row">
@@ -12,7 +18,7 @@
                 }
             </div>
             <div class="col-12 col-lg-4 d-flex align-items-center">
-                <span class="text-truncate">@Model.Cost.ToString("C2")</span>
+                <span class="text-truncate">@(StaticHelper.HideZeroCost(Model.Cost, hideZero))</span>
             </div>
         </div>
         <div class="row">

Views/Vehicle/_VehicleImageMap.cshtml

@@ -1,4 +1,5 @@
 @using CarCareTracker.Helper
+@using System.Globalization
 @inject IConfigHelper config
 @inject ITranslationHelper translator
 @{
@@ -22,7 +23,7 @@
                         @foreach(ImageMap imageMap in Model.Map)
                         {
                             <a style='cursor:pointer;' onclick='loadRecordsByTags("@imageMap.Tags")'>
-                                <polygon points="@imageMap.Coordinates" fill="@imageMap.Color" opacity="@imageMap.Opacity"></polygon>
+                                <polygon points="@imageMap.Coordinates" fill="@imageMap.Color" opacity="@imageMap.Opacity.ToString(CultureInfo.InvariantCulture)"></polygon>
                             </a>
                         }
                     </svg>

wwwroot/js/vehicle.js

@@ -660,10 +660,26 @@ function getLastOdometerReadingAndIncrement(odometerFieldName) {
 
 function showGlobalSearch() {
     $('#globalSearchModal').modal('show');
+    restoreGlobalSearchSettings();
 }
 function hideGlobalSearch() {
     $('#globalSearchModal').modal('hide');
 }
+function saveGlobalSearchSettings() {
+    let globalSearchSettings = {
+        incrementalSearch: $('#globalSearchAutoSearchCheck').is(':checked'),
+        caseSensitive: $('#globalSearchCaseSensitiveCheck').is(':checked')
+    };
+    localStorage.setItem('globalSearchSettings', JSON.stringify(globalSearchSettings));
+}
+function restoreGlobalSearchSettings() {
+    let globalSearchSettings = localStorage.getItem('globalSearchSettings');
+    if (globalSearchSettings != null) {
+        let parsedGlobalSearchSettings = JSON.parse(globalSearchSettings);
+        $('#globalSearchAutoSearchCheck').attr('checked', parsedGlobalSearchSettings.incrementalSearch);
+        $('#globalSearchCaseSensitiveCheck').attr('checked', parsedGlobalSearchSettings.caseSensitive);
+    }
+}
 function performGlobalSearch() {
     var searchQuery = $('#globalSearchInput').val();
     if (searchQuery.trim() == '') {
@@ -672,6 +688,7 @@ function performGlobalSearch() {
         $('#globalSearchInput').removeClass('is-invalid');
     }
     let caseSensitiveSearch = $("#globalSearchCaseSensitiveCheck").is(':checked');
+    saveGlobalSearchSettings();
     $.post('/Vehicle/SearchRecords', { vehicleId: GetVehicleId().vehicleId, searchQuery: searchQuery, caseSensitive: caseSensitiveSearch }, function (data) {
         $('#globalSearchModalResults').html(data);
     });