From d7265def882a752afa0220ffe2d0cf731b6b34b4 Mon Sep 17 00:00:00 2001
From: caf <chirkof.02@gmail.com>
Date: Fri, 20 Jan 2023 14:57:59 +0400
Subject: [PATCH] fix

---
 src/app/pages/terminals/terminals.component.html | 10 ++++++++--
 src/app/pages/terminals/terminals.component.ts   |  4 ++--
 src/app/services/jsonrpc.service.ts              |  5 +++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/app/pages/terminals/terminals.component.html b/src/app/pages/terminals/terminals.component.html
index 1415c0f..6661aa2 100644
--- a/src/app/pages/terminals/terminals.component.html
+++ b/src/app/pages/terminals/terminals.component.html
@@ -106,7 +106,10 @@
         <th>
           Обновлено:
         </th>
-        <th>
+        <th *ngIf="terminal?.socket_data?.last_ping === null">
+          Нет Данных
+        </th>
+        <th *ngIf="!(terminal?.socket_data?.last_ping === null)">
           {{terminal?.socket_data?.last_ping | date:'dd.MM.yy, HH:mm:ss'}}
         </th>
       </tr>
@@ -114,7 +117,10 @@
         <th>
           Закрыто:
         </th>
-        <th>
+        <th *ngIf="terminal?.socket_data?.closed === null">
+          Нет Данных
+        </th>
+        <th *ngIf="!(terminal?.socket_data?.closed === null)">
           {{terminal?.socket_data?.closed ? 'Да' : 'Нет'}}
         </th>
       </tr>
diff --git a/src/app/pages/terminals/terminals.component.ts b/src/app/pages/terminals/terminals.component.ts
index c453f67..971391d 100644
--- a/src/app/pages/terminals/terminals.component.ts
+++ b/src/app/pages/terminals/terminals.component.ts
@@ -99,8 +99,8 @@ export class TerminalsComponent implements OnInit {
   async getTerminal(id: string) {
     await this.jsonRpcService.rpc({
       method: 'getTerminal',
-      params: [ this.choose, id]
-    }, RpcService.authService, false)
+      params: [this.choose, id]
+    }, RpcService.authService, true)
       .subscribe({
         next: (result) => {
           let data = result.result;
diff --git a/src/app/services/jsonrpc.service.ts b/src/app/services/jsonrpc.service.ts
index b572333..1859618 100644
--- a/src/app/services/jsonrpc.service.ts
+++ b/src/app/services/jsonrpc.service.ts
@@ -40,11 +40,12 @@ export class JsonrpcService {
     private cookiesService: CookiesService
   ) { }
 
-  rpc(data: {method: string, params: any},service: RpcService, auth = false): Observable<any> {
+  rpc(data: {method: string, params: any}, service: RpcService, auth?: boolean): Observable<any> {
     let headers = new HttpHeaders();
     const token = decodeURI(this.cookiesService.getItem('token') ?? '');
+    console.log(token);
     headers = headers.set('Content-Type', 'application/json');
-    auth ? headers.set('Authorization', token) : null;
+    auth ? headers = headers.append('Authorization', token) : null;
     const options = {
       headers: headers,
     };