From 35fa921b20cbc185e3bdde3bd16cde94cc5912da Mon Sep 17 00:00:00 2001
From: Luba Kaysina <klv@hlcompany.ru>
Date: Thu, 30 Jun 2022 10:49:03 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BF=D0=B8=D1=81?=
 =?UTF-8?q?=D0=B0=D0=BB=D0=B0=20=D1=84=D0=B8=D0=BB=D1=8C=D1=82=D1=80=D0=B0?=
 =?UTF-8?q?=D1=86=D0=B8=D1=8E=20=D0=B2=20=D1=81=D0=BF=D0=B8=D1=81=D0=BA?=
 =?UTF-8?q?=D0=B5=20=D0=B7=D0=B0=D0=BA=D0=B0=D0=B7=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/pages/orders/orders.component.html    |  6 ++---
 src/app/pages/orders/orders.component.ts      | 26 +++++++++++++++++--
 .../pages/terminals/terminals.component.ts    |  5 ++++
 3 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/src/app/pages/orders/orders.component.html b/src/app/pages/orders/orders.component.html
index 1081df1..e4edf8b 100644
--- a/src/app/pages/orders/orders.component.html
+++ b/src/app/pages/orders/orders.component.html
@@ -23,8 +23,8 @@
       </tr>
       <tr style="position:sticky !important; top: 55px">
         <th></th>
-        <th><p-columnFilter type="text" field="status_h"></p-columnFilter></th>
-        <th><p-columnFilter type="text" field="address.name"></p-columnFilter></th>
+        <th><p-columnFilter type="text" field="status_h" [matchModeOptions]="matchModeOptions" [matchMode]="'custom-contains'"></p-columnFilter></th>
+        <th><p-columnFilter type="text" field="address.name" [matchModeOptions]="matchModeOptions" [matchMode]="'custom-contains'"></p-columnFilter></th>
         <th></th>
         <th></th>
         <th></th>
@@ -53,7 +53,7 @@
 
 <ng-template #order_v>
   <div>
-    <button (click)="listOrders()">К списку заказов</button>
+    <button (click)="listOrders()">К списку</button>
     <h1>Заказ: {{order[0].id}}</h1>
     <p-table [value]="order">
       <ng-template pTemplate="header">
diff --git a/src/app/pages/orders/orders.component.ts b/src/app/pages/orders/orders.component.ts
index 0fe5bf9..de57ca8 100644
--- a/src/app/pages/orders/orders.component.ts
+++ b/src/app/pages/orders/orders.component.ts
@@ -5,7 +5,7 @@ import { MessageService } from "primeng/api";
 import { Order, Products, Delivery_address, Notification, Refund } from "src/app/interface/data";
 import { ClientsComponent } from "../clients/clients.component";
 import { ToastModule } from 'primeng/toast';
-import { ConfirmationService } from 'primeng/api';
+import { ConfirmationService, FilterService, FilterMatchMode, SelectItem } from 'primeng/api';
 /*import { SwPush, NewsletterService } from '@angular/service-worker*/
 
 
@@ -33,6 +33,7 @@ export class OrdersComponent implements OnInit {
   public sumRef0: any = 0;
   public sumRef1: any = 0;
   public sumRef2: any = 0;
+  public matchModeOptions!: SelectItem[];
 
 
   public statuses = [
@@ -58,7 +59,8 @@ export class OrdersComponent implements OnInit {
       private jsonRpcService: JsonrpcService,
       private messageService: MessageService,
       private clientsComponent: ClientsComponent,
-      private confirmationService: ConfirmationService
+      private confirmationService: ConfirmationService,
+      private filterService: FilterService
     ) {
     }
 
@@ -73,7 +75,27 @@ export class OrdersComponent implements OnInit {
       setInterval(() => this.getOrders(), 60000);
       this.chooseName = this.jsonRpcService.ClientChooseName;
     }
+    const customFilterName = "custom-contains";
+    this.filterService.register(customFilterName, (value: any, filter: any): boolean => {
+      if (filter === undefined || filter === null || filter.trim() === '') {
+        return true;
+      }
 
+      if (value === undefined || value === null) {
+        return false;
+      }
+      let det = value.toString()
+      let det2 = det.toLowerCase()
+      return det2.includes(filter.toString()) || det.includes(filter.toString());
+
+    });
+
+    this.matchModeOptions = [
+      { label: 'Содержит', value: customFilterName },
+      { label: 'Равно', value: FilterMatchMode.EQUALS },
+      { label: 'Начинается с', value: FilterMatchMode.STARTS_WITH },
+    ];
+   
   }
 
   notif() {
diff --git a/src/app/pages/terminals/terminals.component.ts b/src/app/pages/terminals/terminals.component.ts
index b6589e9..39078d8 100644
--- a/src/app/pages/terminals/terminals.component.ts
+++ b/src/app/pages/terminals/terminals.component.ts
@@ -94,6 +94,11 @@ export class TerminalsComponent implements OnInit {
     setTimeout(() => document.getElementsByTagName("input")[1].value = division_id, 100);
     this.jsonRpcService.changeId = id;
     this.getAreas()
+    for (let i = 0; i < this.areas.length; i++) {
+      if (this.areas[i].name == area_types) {
+        this.areas[i].selected = true
+      }
+    }
   }
 
   updateTerminal() {