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 @@
-
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 @@
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'
- }
-
-
}