diff --git a/src/app/pages/publications/view-publications/view-publications.page.ts b/src/app/pages/publications/view-publications/view-publications.page.ts index ea2a2a2dd..9ea07b9cf 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.ts +++ b/src/app/pages/publications/view-publications/view-publications.page.ts @@ -165,6 +165,7 @@ export class ViewPublicationsPage implements OnInit { this.showLoader = false; }, (error) => { + this.showLoader = false; if(error.status == 0) { this.getFromDB() } else { diff --git a/src/app/shared/publication/view-publications/view-publications.page.ts b/src/app/shared/publication/view-publications/view-publications.page.ts index 758ca8335..641d350ca 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.ts +++ b/src/app/shared/publication/view-publications/view-publications.page.ts @@ -78,11 +78,10 @@ export class ViewPublicationsPage implements OnInit { } doRefresh =(event) => { - this.getPublicationsIds(); - setTimeout(() => { - this.getPublicationDetail(); - }, 3000); + this.getPublicationDetail(); + + this.getPublicationsIds(); } close() { @@ -90,9 +89,13 @@ export class ViewPublicationsPage implements OnInit { } getPublicationDetail() { + this.showLoader = true; this.publications.GetPresidentialAction(this.folderId).subscribe(res=>{ - + this.showLoader = false; this.item = res; + }, (error) => { + this.showLoader = false; + // this.httpErroHandle.httpStatusHandle(error) }); } @@ -100,21 +103,11 @@ export class ViewPublicationsPage implements OnInit { this.showLoader = true; const folderId = this.folderId - //this.getFromDB() this.publications.GetPublicationsImages(this.folderId).subscribe(res => { this.publicationList = new Array(); - /* for(let i = 0; i < res.length; i++) { - this.publications.GetPublicationById(res[i]).subscribe(ress => { - - let item: Publication = this.publicationPipe.itemList(ress) - - this.publicationList.push(item); - }) - } */ - res.forEach(element => { this.publications.GetPublicationById(element).subscribe(ress => { @@ -133,6 +126,7 @@ export class ViewPublicationsPage implements OnInit { this.getpublication = this.publicationList; this.showLoader = false; },() => { + this.showLoader = false; this.getFromDB(); }); } diff --git a/version/git-version.ts b/version/git-version.ts index 8a48690a1..6547ee763 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "75e6a6269", - "SHA": "75e6a62695abe44be50786e4cde227eec3b2a93c", + "shortSHA": "d289f377b", + "SHA": "d289f377b5f325c93aabed6f5a816583b565a4ae", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Mon Feb 27 18:38:55 2023 +0100'", - "lastCommitMessage": "remove", - "lastCommitNumber": "4840", + "lastCommitTime": "'Mon Feb 27 19:52:30 2023 +0100'", + "lastCommitMessage": "fix publication", + "lastCommitNumber": "4841", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/home/home.page.ts\n\tmodified: src/app/modals/view-document/view-document.page.scss\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified: src/app/pages/publications/publications.page.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\n\tmodified: src/app/shared/agenda/view-event/view-event.page.scss\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified: src/app/shared/popover/chat-popover/chat-popover.page.html\n\tmodified: src/environments/environment.ts\n\tmodified: src/global.scss", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/publications/view-publications/view-publications.page.ts\n\tmodified: src/app/shared/publication/view-publications/view-publications.page.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file