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 949d3a0b7..39409c42c 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.ts +++ b/src/app/pages/publications/view-publications/view-publications.page.ts @@ -140,22 +140,21 @@ export class ViewPublicationsPage implements OnInit { this.showLoader = true; const folderId = this.folderId - this.getFromDB() this.publications.GetPublicationsImages(this.folderId).subscribe(res => { console.log('publications ids', res) this.publicationList = new Array(); - for(let i = 0; i < res.length; i++) { + /* for(let i = 0; i < res.length; i++) { this.publications.GetPublicationById(res[i]).subscribe(ress => { console.log('publications by ids', ress) let item: Publication = this.publicationPipe.itemList(ress) console.log('publications by ids 2', item) this.publicationList.push(item); }) - } + } */ - /* res.forEach(element => { + res.forEach(element => { console.log('publications elements', element) this.publications.GetPublicationById(element).subscribe(ress => { console.log('publications by ids', ress) @@ -164,7 +163,7 @@ export class ViewPublicationsPage implements OnInit { this.publicationList.push(item); }) - }); */ + }); console.log('PUBLICATIONS IMAGEs',this.publicationList) this.sqliteservice.updateactions(this.folderId, JSON.stringify(this.publicationList)); console.log('PUBLICATIONS IMAGEs',this.publicationList) @@ -184,6 +183,8 @@ export class ViewPublicationsPage implements OnInit { this.publicationListStorage.add(folderId, this.publicationList) this.getpublication = this.publicationList; */ + }, (error) => { + this.getFromDB() }); } diff --git a/src/app/shared/publication/view-publications/view-publications.page.html b/src/app/shared/publication/view-publications/view-publications.page.html index 69095520f..83acf49c6 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.html +++ b/src/app/shared/publication/view-publications/view-publications.page.html @@ -41,7 +41,7 @@
image 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 5f2a5f21c..5584d9bf1 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.ts +++ b/src/app/shared/publication/view-publications/view-publications.page.ts @@ -61,7 +61,7 @@ export class ViewPublicationsPage implements OnInit { this.folderId = this.folderId['ProcessId'] } - this.getPublications(); + this.getPublicationsIds(); this.getPublicationDetail(); window['app-view-publications-page-doRefresh'] = this.doRefresh @@ -75,15 +75,16 @@ export class ViewPublicationsPage implements OnInit { console.log('change view to ',this.folderId) //setTimeout(()=>{ - this.getPublications(); this.getPublicationDetail(); + this.getPublicationsIds(); + //}, 100) } doRefresh =(event) => { - this.getPublications(); + this.getPublicationsIds(); setTimeout(() => { this.getPublicationDetail(); @@ -105,22 +106,22 @@ export class ViewPublicationsPage implements OnInit { this.showLoader = true; const folderId = this.folderId - this.getFromDB() + //this.getFromDB() this.publications.GetPublicationsImages(this.folderId).subscribe(res => { console.log('publications ids', res) this.publicationList = new Array(); - for(let i = 0; i < res.length; i++) { + /* for(let i = 0; i < res.length; i++) { this.publications.GetPublicationById(res[i]).subscribe(ress => { console.log('publications by ids', ress) let item: Publication = this.publicationPipe.itemList(ress) console.log('publications by ids 2', item) this.publicationList.push(item); }) - } + } */ - /* res.forEach(element => { + res.forEach(element => { console.log('publications elements', element) this.publications.GetPublicationById(element).subscribe(ress => { console.log('publications by ids', ress) @@ -129,7 +130,7 @@ export class ViewPublicationsPage implements OnInit { this.publicationList.push(item); }) - }); */ + }); console.log('PUBLICATIONS IMAGEs',this.publicationList) this.storage.remove('view_publications'); this.storage.set('view_publications', this.publicationList); @@ -138,6 +139,8 @@ export class ViewPublicationsPage implements OnInit { this.publicationListStorage.add(folderId, this.publicationList) this.getpublication = this.publicationList; this.showLoader = false; + },() => { + this.getFromDB(); }); } @@ -151,7 +154,7 @@ export class ViewPublicationsPage implements OnInit { this.showLoader = true; const folderId = this.folderId this.publicationList = new Array(); - this.getFromDB(); + //this.getFromDB(); this.publications.GetPublications(folderId).subscribe(async res=> { res.forEach(element => {