diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts
index 95d506568..8d60e675f 100644
--- a/src/app/pages/search/search.page.ts
+++ b/src/app/pages/search/search.page.ts
@@ -67,14 +67,13 @@ export class SearchPage implements OnInit {
this.type = this.navParams.get('type');
this.type = this.navParams.get('type');
+ this.select = this.navParams.get('select');
this.showSearchInput = this.navParams.get('showSearchInput');
if(this.type == null || this.type == undefined) {
- this.select = false;
-
if(this.currentPath == '/home/agenda') {
this.type = "Agenda"
} else if (this.currentPath =='/home/gabinete-digital') {
@@ -83,13 +82,10 @@ export class SearchPage implements OnInit {
} else if (this.currentPath == '/home/publications') {
this.type = "AccoesPresidenciais"
} else {
- this.select = false
+ console.log('search bug!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!')
}
- } else {
- this.select = true;
}
-
}
@@ -99,6 +95,8 @@ export class SearchPage implements OnInit {
selected: item
});
}
+
+ return this.select;
}
ngOnInit() {
@@ -476,31 +474,36 @@ export class SearchPage implements OnInit {
}
- async viewDetail(id:any) {
- console.log(id);
+ async viewDetail(searchDocument: SearchDocument) {
+
+ const ApplicationType = searchDocument.ApplicationType.toString()
+ const Id = searchDocument.Id
- if(!this.selectItem){
- if(window.location.pathname == '/home/agenda'){
+ if(this.select == false){
+ if(this.type == "Agenda") {
const modal = await this.modalCtrl.create({
component: ViewEventPage,
componentProps:{
- eventId: id
+ eventId: Id
},
cssClass: 'modal modal-desktop',
});
await modal.present();
modal.onDidDismiss().then((res)=>{});
- } else if(window.location.pathname == '/home/publications'){
+ } else if(this.type == "AccoesPresidenciais"){
- this.viewPublicationDetail(id);
+ this.viewPublicationDetail(Id);
}
- else if(window.location.pathname == '/home/gabinete-digital'){
+ else if(this.type == "AccoesPresidenciais & ArquivoDespachoElect"){
console.log('OPEN DOC');
- this.viewDocumentDetail(id,'');
+ this.viewDocumentDetail(Id, ApplicationType);
}
+
+ } else {
+ console.log('!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!', this.select)
}
}
diff --git a/src/app/shared/agenda/edit-event/edit-event.component.ts b/src/app/shared/agenda/edit-event/edit-event.component.ts
index af3eee802..0e9fbd9e6 100644
--- a/src/app/shared/agenda/edit-event/edit-event.component.ts
+++ b/src/app/shared/agenda/edit-event/edit-event.component.ts
@@ -208,7 +208,8 @@ export class EditEventComponent implements OnInit {
cssClass: 'modal-width-100-width-background modal',
componentProps: {
type: 'AccoesPresidenciais & ArquivoDespachoElect',
- showSearchInput: true
+ showSearchInput: true,
+ select: true,
}
});
await modal.present();
diff --git a/src/app/shared/agenda/new-event/new-event.component.ts b/src/app/shared/agenda/new-event/new-event.component.ts
index a3fa876f0..311f777cf 100644
--- a/src/app/shared/agenda/new-event/new-event.component.ts
+++ b/src/app/shared/agenda/new-event/new-event.component.ts
@@ -133,7 +133,8 @@ export class NewEventPage implements OnInit {
cssClass: 'modal-width-100-width-background modal',
componentProps: {
type: 'AccoesPresidenciais & ArquivoDespachoElect',
- showSearchInput: true
+ showSearchInput: true,
+ select: true
}
});
await modal.present();
diff --git a/src/app/shared/header/header.page.ts b/src/app/shared/header/header.page.ts
index 0e8f33273..2c5795cfd 100644
--- a/src/app/shared/header/header.page.ts
+++ b/src/app/shared/header/header.page.ts
@@ -66,7 +66,8 @@ export class HeaderPage implements OnInit {
cssClass: classs,
componentProps: {
type: 'AccoesPresidenciais & ArquivoDespachoElect',
- showSearchInput: showSearchInput
+ showSearchInput: showSearchInput,
+ select: false
}
});
return await modal.present();
diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts
index 2a08bc141..eb50b1cd9 100644
--- a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts
+++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts
@@ -45,7 +45,8 @@ export class ChatOptionsPopoverPage implements OnInit {
component: SearchPage,
cssClass: 'group-messages modal-desktop search-modal search-modal-to-desktop',
componentProps: {
- type: 'AccoesPresidenciais & ArquivoDespachoElect'
+ type: 'AccoesPresidenciais & ArquivoDespachoElect',
+ select: true
}
});
await modal.present();