Export not works with connection with Mongo DB. (#405)

* Create draft PR for #404 * Changed TakeLast to Order().Take * Changed Excel exporter * Improved sorting in data exporters --------- Co-authored-by: Branko Zachemsky <[email protected]> Co-authored-by: Peter Kurhajec <[email protected]>
Inxton · May 31, 2024 · 08919cf · 08919cf
1 parent efbff61
commit 08919cf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeView.razor b/src/data/src/AXOpen.Data.Blazor/AxoDataExchange/DataExchangeView.razor
@@ -22,7 +22,7 @@ else
                 <button type="button" class="btn btn-primary ms-2" data-bs-toggle="modal" data-bs-target="#createModal-@ViewGuid" @onclick='() => Create = "LoadFromPLC"'>@Localizer["Load from PLC"]</button>
                 @if (CanExport)
                 {
-                    <button type="button" class="btn btn-primary ms-2" data-bs-toggle="modal" data-bs-target="#exportModal-@ViewGuid" @onclick='async () => { Vm.IsFileExported = false; await Vm.ExportDataAsync("wwwroot/Temp/" + ViewGuid + "/exportData.zip"); await LoadCustomExportDataAsync(); }'>@Localizer["Export"]</button>
+                    <button type="button" class="btn btn-primary ms-2" data-bs-toggle="modal" data-bs-target="#exportModal-@ViewGuid" @onclick='async () => { Vm.IsFileExported = false; await LoadCustomExportDataAsync(); await Vm.ExportDataAsync("wwwroot/Temp/" + ViewGuid + "/exportData.zip"); }'>@Localizer["Export"]</button>
                     <button type="button" class="btn btn-primary ms-2" data-bs-toggle="modal" data-bs-target="#importModal-@ViewGuid" @onclick="async () => { isFileImported = false; await LoadCustomExportDataAsync(); }">@Localizer["Import"]</button>
                 }
             }

diff --git a/src/data/src/AXOpen.Data/ExportImport/BaseDataExporter.cs b/src/data/src/AXOpen.Data/ExportImport/BaseDataExporter.cs
@@ -30,13 +30,13 @@ public BaseDataExporter()
             switch (exportMode)
             {
                 case eExportMode.First:
-                    exportables = dataRepository.Queryable.Where(expression).Take(firstNumber);
+                    exportables = dataRepository.Queryable.Where(expression).Skip((int)dataRepository.Count - firstNumber).Take(firstNumber).OrderByDescending(e => e.RecordId);
                     break;
                 case eExportMode.Last:
-                    exportables = dataRepository.Queryable.Where(expression).TakeLast(firstNumber);
+                    exportables = dataRepository.Queryable.Where(expression).Take(firstNumber).OrderByDescending(e => e.RecordId);
                     break;
                 case eExportMode.Exact:
-                    exportables = dataRepository.Queryable.Where(expression).Skip(firstNumber - 1).Take(secondNumber - firstNumber + 1);
+                    exportables = dataRepository.Queryable.Where(expression).Skip(firstNumber - 1).Take(secondNumber - firstNumber + 1).OrderByDescending(e => e.RecordId);
                     break;
             }
 

diff --git a/src/data/src/exporters/AXOpen.Data.Exporters.Excel/ExcelDataExporter.cs b/src/data/src/exporters/AXOpen.Data.Exporters.Excel/ExcelDataExporter.cs
@@ -100,13 +100,13 @@ public ExcelDataExporter()
         switch (exportMode)
         {
             case eExportMode.First:
-                exportables = dataRepository.Queryable.Where(expression).Take(firstNumber);
+                exportables = dataRepository.Queryable.Where(expression).Skip((int)dataRepository.Count - firstNumber).Take(firstNumber).OrderByDescending(e => e.RecordId);
                 break;
             case eExportMode.Last:
-                exportables = dataRepository.Queryable.Where(expression).TakeLast(firstNumber);
+                exportables = dataRepository.Queryable.Where(expression).Take(firstNumber).OrderByDescending(e => e.RecordId);
                 break;
             case eExportMode.Exact:
-                exportables = dataRepository.Queryable.Where(expression).Skip(firstNumber - 1).Take(secondNumber - firstNumber + 1);
+                exportables = dataRepository.Queryable.Where(expression).Skip(firstNumber - 1).Take(secondNumber - firstNumber + 1).OrderByDescending(e => e.RecordId);
                 break;
         }