From 9ca9ee9245995d13e91238105d16263c5102923a Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 3 Aug 2023 11:37:35 +0100 Subject: [PATCH] fix f --- src/app/home/home.page.html | 2 +- .../gabinete-digital.page.html | 2 +- src/app/pages/login/login.page.html | 4 +- src/app/pages/login/login.page.ts | 2 +- src/app/pages/search/search.page.ts | 97 ++++++++----------- .../despachos/despachos.page.html | 4 +- version/git-version.ts | 10 +- 7 files changed, 55 insertions(+), 66 deletions(-) diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html index 34b79c980..dac104c08 100644 --- a/src/app/home/home.page.html +++ b/src/app/home/home.page.html @@ -21,7 +21,7 @@ Agenda - + diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index f367f6994..be5e26a73 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -591,7 +591,7 @@

Email

- +

Palavra-passe

- +
diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index 77967517b..3a6a82749 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -139,7 +139,7 @@ export class LoginPage implements OnInit { } this.changeProfileService.runLogin(); - this.getToken(); + // this.getToken(); SessionStore.setInativity(true); this.goback(); diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index f3518fbda..d0ace0b2d 100644 --- a/src/app/pages/search/search.page.ts +++ b/src/app/pages/search/search.page.ts @@ -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) }); diff --git a/src/app/shared/gabinete-digital/despachos/despachos.page.html b/src/app/shared/gabinete-digital/despachos/despachos.page.html index 69b388684..eb5ad14fb 100644 --- a/src/app/shared/gabinete-digital/despachos/despachos.page.html +++ b/src/app/shared/gabinete-digital/despachos/despachos.page.html @@ -39,12 +39,12 @@
-
+
-
+
diff --git a/version/git-version.ts b/version/git-version.ts index ef7611ac6..ee23645db 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "9d1d4783d", - "SHA": "9d1d4783dbfd793c980170a4ab4e0c0e00686d00", + "shortSHA": "535c70f5b", + "SHA": "535c70f5bb4488668145b9c2eda3a2fa4dcc39f9", "branch": "developer", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Mon Jul 31 14:54:10 2023 +0100'", + "lastCommitTime": "'Mon Jul 31 16:34:12 2023 +0100'", "lastCommitMessage": "fix", - "lastCommitNumber": "5124", + "lastCommitNumber": "5125", "change": "", - "changeStatus": "On branch developer\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.scss\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\n\tmodified: src/app/shared/agenda/approve-event/approve-event.page.html", + "changeStatus": "On branch developer\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/home/home.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/login/login.page.html\n\tmodified: src/app/pages/login/login.page.ts\n\tmodified: src/app/pages/search/search.page.ts\n\tmodified: src/app/shared/gabinete-digital/despachos/despachos.page.html", "changeAuthor": "peter.maquiran" } \ No newline at end of file