From c0390da8570f1ba33693e869dbd0664c3204ee1c Mon Sep 17 00:00:00 2001
From: Peter Maquiran <peter.maquiran@equilibrium.local>
Date: Tue, 9 Apr 2024 11:28:08 +0100
Subject: [PATCH] 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 @@
               </div>
 
               <ion-img *ngIf="checkFileType.checkFileType(seleted.FileExtension) == 'image'"
-                name="image" ngDefaultControl [src]="'data:image/jpg;base64,' + seleted.Base64" style="height: 69px; width: 69px;"></ion-img>
+                name="image" ngDefaultControl [src]="seleted.url" style="height: 69px; width: 69px;"></ion-img>
 
               <video class="sdf" *ngIf="checkFileType.checkFileType(seleted.FileExtension)  == 'video' " width="70" height="70"
                 preload="metadata" webkit-playsinline="webkit-playsinline">
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 8af95e984..00d3edc56 100644
--- a/src/app/shared/publication/new-publication/new-publication.page.ts
+++ b/src/app/shared/publication/new-publication/new-publication.page.ts
@@ -768,44 +768,44 @@ console.log(stringGerada);
 
   async showCroppModal() {
 
-    // const modal = await this.modalController.create({
-    //   component: CropImagePage,
-    //   componentProps: {
-    //     base64ToCroppe: this.capturedImage
-    //   },
-    //   cssClass: 'modal modal-desktop'
-    // });
+    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;
+    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'
-    //       }
-    //     )
+        const newAttachment = new PublicationAttachmentEntity(
+          {
+            base64: res.data.base64ToCroppe,
+            extension: 'jpeg',
+            OriginalFileName: "image",
+            FileType: 'image'
+          }
+        )
 
-    //     this.PublicationFromMvService.form.Files.push(newAttachment)
-    //   }
-    // }, (error) => {
-    //   console.log(error)
-    // });
+        this.PublicationFromMvService.form.Files.push(newAttachment)
+      }
+    }, (error) => {
+      console.log(error)
+    });
 
-    // await modal.present();
+    await modal.present();
 
-    let fileObject = new PublicationAttachmentEntity({
-      base64: this.removeTextBeforeSlash(this.capturedImage, ',') ,
-      extension: 'jpeg',
-      OriginalFileName: 'video',
-      FileType: 'image'
-    })
-    this.PublicationFromMvService.form.Files.push(fileObject)
+    // let fileObject = new PublicationAttachmentEntity({
+    //   base64: this.removeTextBeforeSlash(this.capturedImage, ',') ,
+    //   extension: 'jpeg',
+    //   OriginalFileName: 'video',
+    //   FileType: 'image'
+    // })
+    // this.PublicationFromMvService.form.Files.push(fileObject)
 
   }
 }