From c01a90b58818dcd13fe7ace6c70aa19422f1f818 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Tue, 6 Jul 2021 18:55:52 +0000 Subject: [PATCH] --- server/AyaNova/Controllers/UnitController.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/server/AyaNova/Controllers/UnitController.cs b/server/AyaNova/Controllers/UnitController.cs index 8537c6d9..a6cab803 100644 --- a/server/AyaNova/Controllers/UnitController.cs +++ b/server/AyaNova/Controllers/UnitController.cs @@ -228,12 +228,13 @@ namespace AyaNova.Api.Controllers } } } - var sorted = slist.OrderBy(z => z.customername).ThenBy(z => z.serial); + var sorted = slist.OrderBy(z => z.CustomerName).ThenBy(z => z.UnitSerial); - return Ok(ApiOkResponse.Response(sorted.Select(z => new NameIdItem { Id = z.unitid, Name = $"{z.serial} {z.customername}" }).ToList())); + //return Ok(ApiOkResponse.Response(sorted.Select(z => new NameIdItem { Id = z.unitid, Name = $"{z.serial} {z.customername}" }).ToList())); + return Ok(ApiOkResponse.Response(sorted)); } public record UnitListByTagParams(List tags, long? restrictToCustomerId); - private record InternalUnitListForSorting(string customername, string serial, long unitid); + private record InternalUnitListForSorting(string CustomerName, string UnitSerial, long UnitId); //------------