From d0dd347babd1d47073412f360985a25df82fe669 Mon Sep 17 00:00:00 2001 From: Equilibrium ITO Date: Mon, 8 Apr 2024 10:30:26 +0100 Subject: [PATCH 1/4] hide options of add new media to publication when a media is shared --- .../publications/new-publication/new-publication.page.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/pages/publications/new-publication/new-publication.page.html b/src/app/pages/publications/new-publication/new-publication.page.html index a0468138f..0aef3ba75 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.html +++ b/src/app/pages/publications/new-publication/new-publication.page.html @@ -75,7 +75,7 @@ -
+
-
+
-
+
Date: Tue, 9 Apr 2024 09:20:49 +0100 Subject: [PATCH 2/4] fix bug --- .../view-publications.page.ts | 80 +------------------ .../new-publication/new-publication.page.ts | 41 +++------- .../upload/publication-from-mv.service.ts | 3 +- src/app/store/publication-folder.service.ts | 13 ++- src/environments/environment.prod.ts | 2 +- 5 files changed, 26 insertions(+), 113 deletions(-) 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.ts b/src/app/shared/publication/new-publication/new-publication.page.ts index 0b9b8b5af..4199aaad6 100644 --- a/src/app/shared/publication/new-publication/new-publication.page.ts +++ b/src/app/shared/publication/new-publication/new-publication.page.ts @@ -321,7 +321,7 @@ export class NewPublicationPage implements OnInit { FileType: this.checkFileType.checkFileType( this.removeTextBeforeSlash(element.mimeType, '/')) as any }) - /* fileObject.needUpload() */ + fileObject.needUpload() this.PublicationFromMvService.form.Files.push(fileObject) }) .catch((err) => console.error(err)); @@ -380,6 +380,7 @@ export class NewPublicationPage implements OnInit { close() { + this.PublicationFromMvService.form.cancel = true if(this.PublicationFromMvService.form.send == false) { this.PublicationFromMvService.cancel() this.PublicationFromMvService.ObjectMergeNotification.close() @@ -765,38 +766,18 @@ console.log(stringGerada); return stringAleatoria; } -async showCroppModal() { - const modal = await this.modalController.create({ - component: CropImagePage, - componentProps: { - base64ToCroppe: this.capturedImage - }, - cssClass: 'modal modal-desktop' - }); + async showCroppModal() { - modal.onDidDismiss().then((res) => { - if (res) { - this.capturedImage = res.data - this.filecontent = true; - this.photoOrVideo = false; - const newAttachment = new PublicationAttachmentEntity( - { - base64: res.data.base64ToCroppe, - extension: 'jpeg', - OriginalFileName: "image", - FileType: 'image' - } - ) + let fileObject = new PublicationAttachmentEntity({ + base64: this.removeTextBeforeSlash(this.capturedImage, ',') , + extension: 'jpeg', + OriginalFileName: 'video', + FileType: 'image' + }) + this.PublicationFromMvService.form.Files.push(fileObject) - this.PublicationFromMvService.form.Files.push(newAttachment) - } - }, (error) => { - console.log(error) - }); - - await modal.present(); -} + } } diff --git a/src/app/shared/publication/upload/publication-from-mv.service.ts b/src/app/shared/publication/upload/publication-from-mv.service.ts index 9197ac7ce..8914ea92c 100644 --- a/src/app/shared/publication/upload/publication-from-mv.service.ts +++ b/src/app/shared/publication/upload/publication-from-mv.service.ts @@ -203,7 +203,7 @@ export class PublicationFromMvService { publication.DocumentId = null; publication.ProcessId = this.folderId - if(this.form.cancel == false) { + if(this.form.cancel == true) { window['upload-header-set-remove'](this.id); return false } @@ -211,7 +211,6 @@ export class PublicationFromMvService { try { await this.publications.CreatePublication(publication.ProcessId, publication).toPromise() - if (this.publicationType == '1') { this.httpErroHandle.httpsSucessMessagge('Criar publicação') } else if (this.publicationType == '2') { diff --git a/src/app/store/publication-folder.service.ts b/src/app/store/publication-folder.service.ts index 25419850f..5edadd882 100644 --- a/src/app/store/publication-folder.service.ts +++ b/src/app/store/publication-folder.service.ts @@ -131,6 +131,15 @@ export class PublicationFolderService { await this.loadPublication(publicationId, folderId) } + for (let localPublication of this.publicationList[folderId]) { + + const apiPublication = publicationIds.includes(localPublication.DocumentId) + if (!apiPublication) { + this.deletePost(folderId, localPublication.DocumentId) + } + } + + this.showLoader = false; this.storage.set(folderId, this.publicationList[folderId]); @@ -161,7 +170,7 @@ export class PublicationFolderService { if (JSON.stringify(a) != JSON.stringify(b)) { - // console.log({a, b}) + console.log({a, b}) this.publicationList[folderId][findIndex] = publicationDetails } else { // console.log({publicationDetails}) @@ -203,7 +212,7 @@ export class PublicationFolderService { if (!found) { this.publicationList[folderId].push(publicationDetails) this.revertPublicationOrder(folderId); - + } else { return this.publicationList[folderId][findIndex] } diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 0bd217c5f..43c1647f5 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -4,4 +4,4 @@ import { environment as oaprProd } from './suport/oapr' import { DevDev } from './suport/dev' -export const environment: Environment = oaprProd; +export const environment: Environment = DevDev; From 3600ed6cd50f0aa2d26245834624a1cd61763496 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 9 Apr 2024 09:28:59 +0100 Subject: [PATCH 3/4] fix crop --- .../new-publication/new-publication.page.ts | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/app/shared/publication/new-publication/new-publication.page.ts b/src/app/shared/publication/new-publication/new-publication.page.ts index 4199aaad6..8af95e984 100644 --- a/src/app/shared/publication/new-publication/new-publication.page.ts +++ b/src/app/shared/publication/new-publication/new-publication.page.ts @@ -768,6 +768,36 @@ console.log(stringGerada); async showCroppModal() { + // const modal = await this.modalController.create({ + // component: CropImagePage, + // componentProps: { + // base64ToCroppe: this.capturedImage + // }, + // cssClass: 'modal modal-desktop' + // }); + + // modal.onDidDismiss().then((res) => { + // if (res) { + // this.capturedImage = res.data + // this.filecontent = true; + // this.photoOrVideo = false; + + // const newAttachment = new PublicationAttachmentEntity( + // { + // base64: res.data.base64ToCroppe, + // extension: 'jpeg', + // OriginalFileName: "image", + // FileType: 'image' + // } + // ) + + // this.PublicationFromMvService.form.Files.push(newAttachment) + // } + // }, (error) => { + // console.log(error) + // }); + + // await modal.present(); let fileObject = new PublicationAttachmentEntity({ base64: this.removeTextBeforeSlash(this.capturedImage, ',') , From c0390da8570f1ba33693e869dbd0664c3204ee1c Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 9 Apr 2024 11:28:08 +0100 Subject: [PATCH 4/4] fix image --- .../new-publication/new-publication.page.ts | 2 +- .../new-publication/new-publication.page.html | 2 +- .../new-publication/new-publication.page.ts | 66 +++++++++---------- 3 files changed, 35 insertions(+), 35 deletions(-) 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/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;">