Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into release/uats

This commit is contained in:
tiago.kayaya
2021-12-13 11:16:37 +01:00
+2 -11
View File
@@ -53,7 +53,6 @@ export class SearchPage implements OnInit {
type : "Agenda" | "Correspondencia" | "AccoesPresidenciais" | "ArquivoDespachoElect" | "AccoesPresidenciais & ArquivoDespachoElect" = "Agenda"; type : "Agenda" | "Correspondencia" | "AccoesPresidenciais" | "ArquivoDespachoElect" | "AccoesPresidenciais & ArquivoDespachoElect" = "Agenda";
select: boolean = false; select: boolean = false;
findOnly = []
showSearchInput = false showSearchInput = false
@@ -70,7 +69,6 @@ export class SearchPage implements OnInit {
this.type = this.navParams.get('type'); this.type = this.navParams.get('type');
this.select = this.navParams.get('select'); this.select = this.navParams.get('select');
this.findOnly = this.navParams.get('findOnly')
this.showSearchInput = this.navParams.get('showSearchInput'); this.showSearchInput = this.navParams.get('showSearchInput');
@@ -201,13 +199,6 @@ export class SearchPage implements OnInit {
} else { } else {
this.showSearchDocuments = this.sortArrayISODate(this.searchDocuments) this.showSearchDocuments = this.sortArrayISODate(this.searchDocuments)
} }
if(this.findOnly){
if(this.findOnly.length >= 1) {
this.showSearchDocuments = this.showSearchDocuments.filter((e)=> this.findOnly.includes(e.ApplicationType))
}
}
} }
sortArrayISODate(myArray: any) { sortArrayISODate(myArray: any) {
@@ -537,10 +528,10 @@ export class SearchPage implements OnInit {
} }
async filterDocList(categoryName:string) { async filterDocList(categoryName:string){
// show all category // show all category
if(this. showCategory == categoryName ) { if(this. showCategory == categoryName ){
this.showSearchDocuments = this.searchDocuments; this.showSearchDocuments = this.searchDocuments;