Support initial rfid options

maxbl4 · Aug 24, 2023 · 94d6144 · 94d6144
1 parent 7bb2f53
commit 94d6144
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 11 deletions.
diff --git a/DataService/Options/ServiceOptions.cs b/DataService/Options/ServiceOptions.cs
diff --git a/DataService/Startup.cs b/DataService/Startup.cs
@@ -31,7 +31,6 @@
 using Newtonsoft.Json.Converters;
 using NJsonSchema;
 using NJsonSchema.Generation.TypeMappers;
-using ServiceOptions = maxbl4.Race.DataService.Options.ServiceOptions;
 
 namespace maxbl4.Race.DataService
 {

diff --git a/DataService/data-service-ui/src/app/timing-session-view/timing-session-view.component.ts b/DataService/data-service-ui/src/app/timing-session-view/timing-session-view.component.ts
@@ -24,7 +24,7 @@ import {DateTime, Duration} from "luxon";
             (click)="refreshRating()">
       <i class="material-icons">refresh</i>Пересчитать
     </button>
-        Начало: {{timingSessionDto.startTime?.toFormat("HH:MM:ss")}}
+        Начало: {{timingSessionDto.startTime?.toFormat("HH:mm:ss")}}
         Осталось: {{durationLeft}}
         Обновлено: {{update?.updated?.toFormat("HH:mm:ss")}}
     <form (submit)="appendRiderId()" *ngIf="timingSessionDto.isRunning">
@@ -158,7 +158,8 @@ export class TimingSessionViewComponent implements OnInit {
 
   get durationLeft(): string{
     if (this.timingSessionDto.startTime && this.sessionDto.finishCriteria?.duration) {
-      const elapsed = DateTime.now().diff(this.timingSessionDto?.startTime);
+      const now = this.timingSessionDto.isRunning ? DateTime.now() : this.timingSessionDto.stopTime!;
+      const elapsed = now.diff(this.timingSessionDto.startTime);
       if (elapsed.as('seconds') > this.sessionDto.finishCriteria.duration.as('seconds')) {
         return "-" + elapsed.plus(this.sessionDto.finishCriteria.duration.negate()).toFormat("hh:mm:ss");
       }else

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