From 30b7b4ddf7d6b500c33c52afefa568b41c1aa77d Mon Sep 17 00:00:00 2001
From: Boris Voropaev <boris1voropaev@gmail.com>
Date: Wed, 14 Feb 2024 12:44:28 +0300
Subject: [PATCH] root page

---
 .../search/page/search-page.component.html      |  4 ++--
 .../layout/header/header.component.html         |  2 +-
 .../layout/jumbotron/jumbotron.component.html   |  2 +-
 .../layout/jumbotron/jumbotron.component.ts     | 17 ++++++++---------
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/app/_modules/search/page/search-page.component.html b/src/app/_modules/search/page/search-page.component.html
index 9c19859..1f78bbb 100644
--- a/src/app/_modules/search/page/search-page.component.html
+++ b/src/app/_modules/search/page/search-page.component.html
@@ -1,6 +1,6 @@
-<div class="top-panel pt-40">
+<div class="search">
   <h1>Поиск</h1>
-  <div class="filters fullwidth" [formGroup]="filters">
+  <div class="filters" [formGroup]="filters">
     <div class="limiter">
       <div class="search">
         <label>Поиск</label>
diff --git a/src/tk023/component/layout/header/header.component.html b/src/tk023/component/layout/header/header.component.html
index 8646554..323178b 100644
--- a/src/tk023/component/layout/header/header.component.html
+++ b/src/tk023/component/layout/header/header.component.html
@@ -6,7 +6,7 @@
     <a class="header-top-menu-logo" [routerLink]="rootPage?.link">
       <img src="assets/images/logo.svg" alt="">
     </a>
-    <a class="header-top-menu-ref">
+    <a class="header-top-menu-ref" [routerLink]="'search'">
       <ico ico="search_24" [size]="24"></ico>
     </a>
     <locale></locale>
diff --git a/src/tk023/component/layout/jumbotron/jumbotron.component.html b/src/tk023/component/layout/jumbotron/jumbotron.component.html
index 2a593fb..6e9b47e 100644
--- a/src/tk023/component/layout/jumbotron/jumbotron.component.html
+++ b/src/tk023/component/layout/jumbotron/jumbotron.component.html
@@ -16,7 +16,7 @@
 
     
                     <div class="name">
-                        <a [routerLink]="regLink(reg.type)">{{reg.name}}</a>
+                        <a [routerLink]="reg.page">{{reg.name}}</a>
                     </div>
     
                     <div *ngIf="reg.startDiscussion" class="discussion">
diff --git a/src/tk023/component/layout/jumbotron/jumbotron.component.ts b/src/tk023/component/layout/jumbotron/jumbotron.component.ts
index 4b62198..500ba3d 100644
--- a/src/tk023/component/layout/jumbotron/jumbotron.component.ts
+++ b/src/tk023/component/layout/jumbotron/jumbotron.component.ts
@@ -35,18 +35,21 @@ export class JumbotronComponent {
 
   ngOnInit(){
 
-    let include = ['sections.type', 'sections.groups.fields.value', 'registry'];
-    this.registriesService.list().subscribe(
+    let include = ['page'];
+    this.registriesService.list({
+        // filters:JSON.stringify({"id": "602770ef-7f5b-421e-a4f4-14e16ca1ee90"}),
+        include: include.join(',')
+      }).subscribe(
       resp => {
         console.log('DATA',resp.data)
         let regID:any = [];
         regID = regID.concat(
           resp.data.filter( reg=> reg.type.name == "notice")
-          .map(reg=>({id: reg.id, type:reg.type.title}))
+          .map(reg=>({id: reg.id, type:reg.type.title, page:reg.page.data.link}))
         )
         regID = regID.concat(
           resp.data.filter( reg=> reg.type.name == "approval")
-          .map(reg=>({id: reg.id, type:reg.type.title}))
+          .map(reg=>({id: reg.id, type:reg.type.title, page:reg.page.data.link}))
         )
         console.log(regID)
         
@@ -65,6 +68,7 @@ export class JumbotronComponent {
                 let properties = resp.data.properties.data.groups.data[0].fields.data;
                 this.regestries.push({
                   type:reg.type,
+                  page: reg.page,
                   createdAt:resp.data.createdAt,
                   notificationDate: properties.find(prop=>prop.name=='notification-date')?.value.data[0],
                   subcommittee: properties.find(prop=>prop.name=='subcommittee')?.value.data[0],
@@ -125,9 +129,4 @@ export class JumbotronComponent {
   }
 
 
-  regLink(name){
-    return name=="Приказы об утверждении"?'prikazy-ob-utverzdenii':'uvedomlenie-o-razrabotke'
-  }
-
-
 }