diff --git a/src/app/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts index 5b9437553..c2998147f 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.ts +++ b/src/app/pages/publications/new-publication/new-publication.page.ts @@ -14,7 +14,7 @@ import { FormControl, FormGroup, Validators } from '@angular/forms'; import { ThemePalette } from '@angular/material/core'; import { formatDate } from 'src/plugin/momentG.js' import { ThemeService } from 'src/app/services/theme.service'; -import { Camera, CameraResultType, CameraSource, Photo } from '@capacitor/camera'; +import { Camera, CameraResultType, CameraSource } from '@capacitor/camera'; import { Filesystem, Directory, Encoding, FilesystemDirectory, FilesystemEncoding } from '@capacitor/filesystem'; import { NgxImageCompressService } from "ngx-image-compress"; 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 490ba8fe2..87f3fd0eb 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.ts +++ b/src/app/pages/publications/view-publications/view-publications.page.ts @@ -231,87 +231,12 @@ export class ViewPublicationsPage implements OnInit { this.showLoader = true; const folderId = this.folderId - try { - const publicationIds = await this.publications.GetPublicationsList(folderId).toPromise(); + await this.publicationFolderService.getPublicationsIds(folderId) - this.createPublicationList(folderId) - let loadLater = [] - for (let publicationId of publicationIds) { - - if (!this.publicationIsPresent(publicationId, folderId)) { - await this.loadPublication(publicationId, folderId) - - } else { - loadLater.push(publicationId) - } - } - - for (let publicationId of loadLater) { - await this.loadPublication(publicationId, folderId) - } - - for (let localPublication of this.publicationFolderService.publicationList[folderId]) { - - const apiPublication = publicationIds.includes(localPublication.DocumentId) - if (!apiPublication) { - this.publicationFolderService.deletePost(folderId, localPublication.DocumentId) - } - } - - this.showLoader = false; - - this.storage.set(folderId, this.publicationFolderService.publicationList[folderId]); - this.getpublication = this.publicationFolderService.publicationList[folderId]; - } catch (error) { - this.showLoader = false; - } + this.showLoader = false; } - publicationIsPresent(publicationId, folderId) { - return this.publicationFolderService.publicationList[folderId].find(e => e.DocumentId == publicationId) - } - publicationFind(publicationId, folderId) { - return this.publicationFolderService.publicationList[folderId].find(e => e.DocumentId == publicationId) - } - publicationFindIndex(publicationId, folderId) { - return this.publicationFolderService.publicationList[folderId].findIndex(e => e.DocumentId == publicationId) - } - - async loadPublication(publicationId, folderId) { - let Publication = await this.publications.GetPublicationWithArrayOfFilesById(publicationId).toPromise(); - console.log('Publications with array of file: ', Publication.Files) - this.arrayOfFile = Publication.Files - let publicationDetails: Publication = this.publicationPipe.itemList(Publication) - - const findIndex = this.publicationFindIndex(publicationId, folderId) - const found = this.publicationIsPresent(publicationId, folderId) - - - - if (!found) { - this.publicationFolderService.publicationList[folderId].push(publicationDetails) - this.publicationFolderService.revertPublicationOrder(folderId) - } else { - - - let a: any = Object.assign({}, this.publicationFolderService.publicationList[folderId][findIndex]) - let b: any = Object.assign({}, publicationDetails) - - a.Files = a.Files.length - b.Files = b.Files.length - - if (JSON.stringify(a) != JSON.stringify(b)) { - - // console.log({a, b}) - this.publicationFolderService.publicationList[folderId][findIndex] = publicationDetails - } else { - // console.log({publicationDetails}) - } - - } - - } async AddPublication(publicationType: any, folderId: any) { @@ -397,4 +322,3 @@ export class ViewPublicationsPage implements OnInit { } } } - diff --git a/src/app/shared/publication/new-publication/new-publication.page.html b/src/app/shared/publication/new-publication/new-publication.page.html index 30afdfc30..d6cad1557 100644 --- a/src/app/shared/publication/new-publication/new-publication.page.html +++ b/src/app/shared/publication/new-publication/new-publication.page.html @@ -64,7 +64,7 @@ + name="image" ngDefaultControl [src]="seleted.url" style="height: 69px; width: 69px;">