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 f2a7f8f06..d941b1dc5 100644
--- a/src/app/shared/publication/new-publication/new-publication.page.ts
+++ b/src/app/shared/publication/new-publication/new-publication.page.ts
@@ -130,7 +130,16 @@ export class NewPublicationPage implements OnInit {
}
console.log('edit',this.publication)
this.pub = this.publication;
- this.seletedContent = this.publication.Files;
+ this.seletedContent = this.publication.Files.map( e => {
+ return new PublicationAttachmentEntity(
+ {
+ base64: e.FileBase64,
+ extension: e.FileExtension,
+ OriginalFileName: e.OriginalFileName,
+ FileType: this.checkFileType.checkFileType(e.FileExtension)
+ }
+ )
+ })
this.showLoader = false;
}, (error) => {
console.log(error)
@@ -322,52 +331,47 @@ export class NewPublicationPage implements OnInit {
if (this.publicationType == ActionType.edit) {
- if (!this.publication?.OriginalFileName || !this.pub.OriginalFileName) {
-
- if (this.pub?.OriginalFileName) {
- console.log('this.pub', this.pub)
- }
- throw ('no this.publication.OriginalFileName')
-
- }
const loader = this.toastService.loading()
- if (this.seletedContent.length > 0) {
- this.publication = {
- DateIndex: this.publication.DateIndex,
- DocumentId: this.publication.DocumentId,
- ProcessId: this.publication.ProcessId,
- Title: this.pub.Title,
- Message: this.pub.Message,
- DatePublication: this.publication.DatePublication,
- OriginalFileName: this.publication.OriginalFileName || 'foto',
- Files: this.seletedContent,
- }
+ this.publication = {
+ DateIndex: this.publication.DateIndex,
+ DocumentId: this.publication.DocumentId,
+ ProcessId: this.publication.ProcessId,
+ Title: this.pub.Title,
+ Message: this.pub.Message,
+ DatePublication: this.publication.DatePublication,
+ Files: this.seletedContent,
+ }
- try {
- const response = await this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise()
+ this.publication.Files = this.publication.Files.map( e => ({
+ FileBase64: e.FileBase64,
+ FileExtension: e.FileExtension,
+ OriginalFileName: 'foto'
+ }))
- this.httpErroHandle.httpsSucessMessagge('Editar publicação')
- console.log({ response })
+ try {
+ const response = await this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise()
+
+ this.httpErroHandle.httpsSucessMessagge('Editar publicação')
+ console.log({ response })
+
+ this.goBack();
+
+ } catch (error) {
+ this.httpErroHandle.httpStatusHandle(error)
+ if (error.status == 404) {
+ this.PublicationFolderService.deletePost(this.publication.ProcessId, this.publication.DocumentId)
this.goBack();
-
- } catch (error) {
- this.httpErroHandle.httpStatusHandle(error)
- if (error.status == 404) {
- this.PublicationFolderService.deletePost(this.publication.ProcessId, this.publication.DocumentId)
- this.goBack();
- }
- } finally {
- loader.remove()
}
-
- } else {
- }/*
- else if (!this.PublicationFolderService.PublicationHasImage(this.publication)) { //
+ } finally {
+ loader.remove()
+ }
+/*
+ else if (!this.PublicationFolderService.PublicationHasImage(this.publication)) { //
this.publication = {
DateIndex: this.publication.DateIndex,
@@ -412,6 +416,16 @@ export class NewPublicationPage implements OnInit {
}
+ // this.publicationFormMV.setDataToFrom(this.publication)
+
+ // this.publicationFormMV.uploadVideosFiles()
+
+ this.publication.Files = this.publication.Files.map( e => ({
+ FileBase64: e.FileBase64,
+ FileExtension: e.FileExtension,
+ OriginalFileName: 'foto'
+ }))
+
const loader = this.toastService.loading()
try {
@@ -1043,7 +1057,7 @@ class PublicationAttachmentEntity {
this.FileBase64 = 'data:image/jpg;base64,' + this.FileBase64
}
} else if (this.FileType == 'video' ) {
- if(!this.FileBase64.startsWith('data:')) {
+ if(!this.FileBase64.startsWith('data:') && !this.FileBase64.startsWith('http')) {
this.FileBase64 = 'data:video/mp4;base64,' + this.FileBase64
}
diff --git a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts
index b2657bb6f..9b489d57a 100644
--- a/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts
+++ b/src/app/shared/publication/view-publications/publication-detail/publication-detail.page.ts
@@ -73,17 +73,17 @@ export class PublicationDetailPage implements OnInit {
if(localPublication?.ProcessId) {
console.log('console.log local storage')
-
+
this.publication = localPublication
console.log('Local publication',this.publication)
} else {
console.log('API res')
-
+
this.showLoader = true;
this.publications.GetPublicationWithArrayOfFilesById(this.publicationId).subscribe(res => {
-
+
this.publication = this.publicationPipe.itemList(res)
console.log('API pub', this.publication)
@@ -96,12 +96,12 @@ export class PublicationDetailPage implements OnInit {
if(error.status == 404) {
this.publicationFolderService.deletePost(this.folderId, this.publicationId)
}
-
+
this.goBack();
this.httpErrorHandle.httpStatusHandle(error)
});
}
-
+
}
close() {
@@ -121,7 +121,7 @@ export class PublicationDetailPage implements OnInit {
if(window['app-view-publications-page-doRefresh']) {
window['app-view-publications-page-doRefresh']()
}
-
+
this.goBackToViewPublications.emit();
} catch (error) {
@@ -138,7 +138,7 @@ export class PublicationDetailPage implements OnInit {
}
async editPost(publicationType:any) {
-
+
if(window.innerWidth < 701){
const modal = await this.modalController.create({
@@ -186,10 +186,4 @@ export class PublicationDetailPage implements OnInit {
modal.present();
}
-
-
-
-
-
-
}
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 88e03720e..29de9e485 100644
--- a/src/app/shared/publication/view-publications/view-publications.page.html
+++ b/src/app/shared/publication/view-publications/view-publications.page.html
@@ -79,7 +79,7 @@
s -->
-
+
{{publication.Title}}
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 ad5e68ac6..ec82302c1 100644
--- a/src/app/shared/publication/view-publications/view-publications.page.ts
+++ b/src/app/shared/publication/view-publications/view-publications.page.ts
@@ -227,8 +227,6 @@ export class ViewPublicationsPage implements OnInit {
this.publicationFolderService.publicationList[folderId].push(publicationDetails)
} else {
- // console.log("names");
-
let a: any = Object.assign({},this.publicationFolderService.publicationList[folderId][findIndex])
let b: any = Object.assign({}, publicationDetails)
diff --git a/src/app/store/publication-folder.service.ts b/src/app/store/publication-folder.service.ts
index 7221ea60e..b30a1dbe8 100644
--- a/src/app/store/publication-folder.service.ts
+++ b/src/app/store/publication-folder.service.ts
@@ -217,11 +217,11 @@ export class PublicationFolderService {
PublicationHasImage(Publication: Publication) {
- return Publication.Files[0].FileBase64 != '' && Publication.Files[0].FileBase64 != "data:image/jpg;base64,null"
+ return Publication?.Files?.[0]?.FileBase64 != '' && Publication?.Files?.[0]?.FileBase64 != "data:image/jpg;base64,null"
}
hasCapturedImage(Publication: Publication) {
- return Publication.Files[0].FileBase64 != '' && Publication.Files[0].FileBase64 != "data:image/jpg;base64,null"
+ return Publication?.Files?.[0]?.FileBase64 != '' && Publication?.Files?.[0]?.FileBase64 != "data:image/jpg;base64,null"
}
}