peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-21 05:45:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix f

Browse Source
This commit is contained in:
Peter Maquiran
2023-08-03 11:37:35 +01:00
parent 535c70f5bb
commit 9ca9ee9245
7 changed files with 55 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/search/search.page.ts
+43 -54
View File
@@ -461,7 +461,7 @@ export class SearchPage implements OnInit {
} else {
let counter = 0;
this.search.searchForDoc(this.searchSubject, searchDocumentDate, this.searchSender
this.search.basicSearch(this.searchSubject, searchDocumentDate, this.searchSender
,this.searchOrganicEntiry, this.searchDocTypeId, '8').subscribe(res => {
res.Categories.forEach( e => {
e['Active'] = false;
@@ -501,7 +501,7 @@ export class SearchPage implements OnInit {
}
});
this.search.searchForDoc(this.searchSubject, searchDocumentDate, this.searchSender
this.search.basicSearch(this.searchSubject, searchDocumentDate, this.searchSender
,this.searchOrganicEntiry, this.searchDocTypeId, '361').subscribe(res => {
res.Categories.forEach( e => {
@@ -594,7 +594,7 @@ export class SearchPage implements OnInit {
} else {
let counter = 0;
this.search.searchForDoc(this.searchSubject, searchDocumentDate, this.searchSender
this.search.basicSearch(this.searchSubject, searchDocumentDate, this.searchSender
,this.searchOrganicEntiry, this.searchDocTypeId, '8').subscribe(res=>{
res.Categories.forEach( e => {
@@ -645,54 +645,50 @@ export class SearchPage implements OnInit {
this.searchCategories = []
this.searchDocuments = []
this.search.basicSearch(this.searchSubject, searchDocumentDate, this.searchSender
,this.searchOrganicEntiry, this.searchDocTypeId, '386').subscribe(res=>{
// this.search.basicSearchPublication(this.searchSubject, searchDocumentDate, this.searchSender
// ,this.searchOrganicEntiry, this.searchDocTypeId, '386').subscribe(res=>{
res.Categories.forEach( e => {
e['Active'] = false;
if(!environment.presidential) {
e['Name'] = "Publicações"
}
});
// res.Categories.forEach( e => {
// e['Active'] = false;
// e['Name'] = "Publicações"
// });
// bind respose
for ( const a of res.Categories) {
this.searchCategories.push(a);
}
// // bind respose
// for ( const a of res.Categories) {
// this.searchCategories.push(a);
// }
for ( const a of this.sortArrayISODate(res.Documents)) {
if(!environment.presidential) {
a.DocTypeDesc = "Publicações"
}
this.searchDocuments.push(a);
}
// for ( const a of this.sortArrayISODate(res.Documents)) {
// a.DocTypeDesc = "Publicações"
// this.searchDocuments.push(a);
// }
this.reorderList(this.ordinance);
// this.reorderList(this.ordinance);
// hide show document
if(this.searchDocuments.length >= 1){
this.showDocuments = true;
} else {
this.showDocuments = false
}
// // hide show document
// if(this.searchDocuments.length >= 1){
// this.showDocuments = true;
// } else {
// this.showDocuments = false
// }
counter++;
// counter++;
if(counter ==2){
this.showLoader = false;
}
// if(counter ==2){
// this.showLoader = false;
// }
this.loadWordCloud();
}, error => {
counter++;
// this.loadWordCloud();
// }, error => {
// counter++;
if(counter == 2) {
this.showLoader = false;
}
this.searchResult = "Registo não encontrado"
console.log(error)
});
// if(counter == 2) {
// this.showLoader = false;
// }
// this.searchResult = "Registo não encontrado"
// console.log(error)
// });
@@ -702,9 +698,7 @@ export class SearchPage implements OnInit {
res.Categories.forEach( e => {
e['Active'] = false;
if(!environment.presidential) {
e['Name'] = "Acções"
}
e['Name'] = "Acções"
});
if(!environment.presidential) {
@@ -717,10 +711,8 @@ export class SearchPage implements OnInit {
for ( const a of this.sortArrayISODate(res.Documents)) {
if(!environment.presidential) {
a.DocTypeDesc = "Acções"
this.searchDocuments.push(a);
}
a.DocTypeDesc = "Acções"
this.searchDocuments.push(a);
}
this.reorderList(this.ordinance);
@@ -734,16 +726,13 @@ export class SearchPage implements OnInit {
counter++;
if(counter ==2) {
this.showLoader = false;
}
this.showLoader = false;
this.loadWordCloud();
}, error => {
counter++;
if(counter ==2) {
this.showLoader = false;
}
this.showLoader = false;
this.searchResult = "Registo não encontrado"
console.log(error)
});