Sort events by date

maxbl4 · Aug 24, 2023 · 7bb2f53 · 7bb2f53
1 parent 21a7f42
commit 7bb2f53
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/DataService/Controllers/DataController.cs b/DataService/Controllers/DataController.cs
@@ -140,7 +140,8 @@ public ActionResult<List<SeriesDto>> ListSeries()
         [HttpGet("championships")]
         public ActionResult<List<ChampionshipDto>> ListChampionships([FromQuery]Id<SeriesDto> value)
         {
-            return upstreamRepository.ListChampionships(value).ToList();
+            return upstreamRepository.ListChampionships(value)
+                .OrderBy(x => x.Name).ToList();
         }
 
         [HttpGet("classes")]
@@ -152,7 +153,8 @@ public ActionResult<List<ClassDto>> ListClasses([FromQuery]Id<ChampionshipDto> v
         [HttpGet("events")]
         public ActionResult<List<EventDto>> ListEvents([FromQuery]Id<ChampionshipDto> value)
         {
-            return upstreamRepository.ListEvents(value).ToList();
+            return upstreamRepository.ListEvents(value)
+                .OrderByDescending(x => x.EndOfRegistration).ToList();
         }
     }
 }
diff --git a/DataService/data-service-ui/src/app/event-view/event-view.component.ts b/DataService/data-service-ui/src/app/event-view/event-view.component.ts
@@ -9,7 +9,7 @@ import {EventSelectorService} from "@app/service/event-selector-service";
   selector: 'app-event-view',
   template: `
     <h3>{{eventDto.name}}</h3>
-    <table class="table table-bordered">
+    <table class="table table-bordered" *ngIf="sessions">
       <thead>
         <tr>
           <th>Название</th>

diff --git a/DataService/publish-docker.ps1 b/DataService/publish-docker.ps1
@@ -1,4 +1,4 @@
-#1.0.3
+#1.0.5
 
 function Main()
 {