From 7bd1370c0bf1ba5d935f068f48ac041aa27b796a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eudes=20In=C3=A1cio?= <eudes.inacio@equilibrium.local>
Date: Mon, 20 Nov 2023 14:12:32 +0100
Subject: [PATCH] changes and changes

---
 android/app/src/main/AndroidManifest.xml      |  1 -
 src/app/home/home.page.ts                     |  2 +-
 .../new-publication/new-publication.page.html | 22 ++++--
 .../new-publication/new-publication.page.scss | 19 +++++
 .../new-publication/new-publication.page.ts   | 72 ++++++++++++++-----
 .../view-publications.page.ts                 |  3 +-
 .../services/checkFileType.service.spec.ts    | 16 +++++
 src/app/services/checkFileType.service.ts     | 36 ++++++++++
 src/app/services/http-error-handle.service.ts | 27 +++----
 src/app/services/publications.service.ts      | 13 ++++
 src/app/services/shareIntent.ts               |  8 +--
 src/app/store/publication-folder.service.ts   |  2 +-
 12 files changed, 174 insertions(+), 47 deletions(-)
 create mode 100644 src/app/services/checkFileType.service.spec.ts
 create mode 100644 src/app/services/checkFileType.service.ts

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 6682d73d1..bef5d7d92 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -42,7 +42,6 @@
       <!-- Depending on your project, you can add here the type of data you wish to receive -->
       <data android:mimeType="text/plain" />
       <data android:mimeType="image/*" />
-      <data android:mimeType="application/*" />
       <data android:mimeType="video/*" />
     </intent-filter>
   </activity>
diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts
index 69d9e046f..69b704ff5 100644
--- a/src/app/home/home.page.ts
+++ b/src/app/home/home.page.ts
@@ -295,7 +295,7 @@ export class HomePage implements OnInit {
       App.addListener('appStateChange', ({ isActive }) => {
         if (isActive) {
           sendIntent.setRouteService(this.router)
-          this.checkSendIntentReceived();
+          /* this.checkSendIntentReceived(); */
           console.log('App is in the foreground');
           /* this.checkSendIntentReceived() */
         } else {
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 867ef103b..9f7d0d9bb 100644
--- a/src/app/pages/publications/new-publication/new-publication.page.html
+++ b/src/app/pages/publications/new-publication/new-publication.page.html
@@ -32,15 +32,25 @@
 
         <div class="d-flex justify-content-between">
           <div class="d-flex">
-            <ion-thumbnail slot="start">
+            <ion-thumbnail *ngFor="let seleted of seletedContent.slice(0, displayLimit), let i = index" lot="start">
 
-              <ion-img *ngIf="fileType == 'image/jpeg'" [(ngModel)]="capturedImage" name="image" ngDefaultControl [src]="capturedImage" (click)="imageSize(capturedImage)" ></ion-img>
+              <ion-img *ngIf="checkFileType.checkFileType(seleted.fileType) == 'image'" [(ngModel)]="capturedImage"
+                name="image" ngDefaultControl [src]="'data:image/jpg;base64,' + seleted.base64"
+                (click)="imageSize(capturedImage)"></ion-img>
 
-              <video *ngIf="fileType == 'video'" width="70" height="70" controls="controls" preload="metadata" autoplay="autoplay" webkit-playsinline="webkit-playsinline">
-                <source type="video/mp4" [src]="capturedVideo">
+              <video *ngIf="checkFileType.checkFileType(seleted.fileType)  == 'video'" width="70" height="70"
+                controls="controls" preload="metadata" autoplay="autoplay" webkit-playsinline="webkit-playsinline">
+                <source type="video/mp4" [src]="'data:video/mp4;base64,' + capturedVideo">
               </video>
 
             </ion-thumbnail>
+            <!-- Display the blurred image and count if there are more images -->
+            <ion-thumbnail *ngIf="seletedContent.length > displayLimit" lot="start">
+              <ion-img [src]="'data:image/jpg;base64,' + seletedContent[displayLimit - 1].base64"
+                style="filter: blur(5px);"></ion-img>
+              
+                <p>mais {{ seletedContent.length - displayLimit }}</p>
+            </ion-thumbnail>
             <ion-label class="pl-10">
               <p>{{capturedImageTitle}}</p>
               <p hidden>size</p>
@@ -87,8 +97,8 @@
         <button id="container-multiselect" class="multiselect-button" (click)="takePicture()">Fotografia</button>
         <button id="container-multiselect" class="multiselect-button" (click)="startVideoRecording()">Video</button>
       </div>
-      
-     <!--  <div *ngIf="photoOrVideo" class="ion-item-container-no-border">
+
+      <!--  <div *ngIf="photoOrVideo" class="ion-item-container-no-border">
         <ion-label (click)="takePicture()">
           <div class="attach-icon">
             <ion-icon *ngIf="ThemeService.currentTheme == 'default' "
diff --git a/src/app/pages/publications/new-publication/new-publication.page.scss b/src/app/pages/publications/new-publication/new-publication.page.scss
index b3961715a..8bd1517e1 100644
--- a/src/app/pages/publications/new-publication/new-publication.page.scss
+++ b/src/app/pages/publications/new-publication/new-publication.page.scss
@@ -66,9 +66,28 @@ ion-toolbar{
   border-radius: 3px;
   width: 40%;
   border: groove;
+  color: #000;
   background-color: white;
 }
 
+.blur-overlay {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background: rgba(255, 255, 255, 0.7); /* Adjust the opacity as needed */
+}
+
+.blur-overlay p {
+  font-size: 16px;
+  font-weight: bold;
+  color: #333;
+}
+
 .container button:last-child {
   --border-radius: 50px;
   width: 40%;
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 c723231af..6e40b2968 100644
--- a/src/app/pages/publications/new-publication/new-publication.page.ts
+++ b/src/app/pages/publications/new-publication/new-publication.page.ts
@@ -29,7 +29,7 @@ import { CaptureError, CaptureImageOptions, MediaCapture, MediaFile } from '@awe
 import { Capacitor } from '@capacitor/core';
 import { File } from '@ionic-native/file/ngx';
 import { Media } from '@ionic-native/media/ngx';
-
+import { checkFileTypeService } from 'src/app/services/checkFileType.service';
 const config = {
   quality: 0.5,
   maxWidth: 800,
@@ -111,6 +111,9 @@ export class NewPublicationPage implements OnInit {
   photoOrVideo: boolean = false;
   fileType = "";
   filecontent: boolean;
+  seletedContent: any[] = []
+  // Set a limit for the number of images to display
+  displayLimit = 4;
 
   constructor(
     private modalController: ModalController,
@@ -126,7 +129,8 @@ export class NewPublicationPage implements OnInit {
     public PublicationFolderService: PublicationFolderService,
     private RouteService: RouteService,
     public FileService: FileService,
-    private mediaCapture: MediaCapture
+    private mediaCapture: MediaCapture,
+    public checkFileType: checkFileTypeService
   ) {
 
     this.publicationType = this.navParams.get('publicationType');
@@ -142,7 +146,27 @@ export class NewPublicationPage implements OnInit {
   ngOnInit() {
     if (this.intent) {
       this.filecontent = true
-      this.capturedImage = 'data:image/jpeg;base64,' + this.intent;
+      console.log(this.intent)
+      if (this.checkFileType.checkFileType(this.intent.type) == 'image') {
+        this.fileType = 'image'
+        let resultUrl = decodeURIComponent(this.intent.url);
+        Filesystem.readFile({ path: resultUrl }).then(async (content) => {
+          this.capturedImage = 'data:image/jpeg;base64,' + content.data;
+          console.log(this.capturedImage)
+        })
+      } else if (this.checkFileType.checkFileType(this.intent.type) == 'video') {
+        this.fileType = 'video'
+        let resultUrl = decodeURIComponent(this.intent.url);
+        Filesystem.readFile({ path: resultUrl }).then(async (content) => {
+          this.capturedVideo = "data:video/mp4;base64," + content.data;
+          console.log(this.capturedVideo)
+        })
+
+      } else {
+        this.httpErrorHandle.validationMessagge('filetype');
+      }
+
+
     }
 
     this.setTitle();
@@ -171,7 +195,7 @@ export class NewPublicationPage implements OnInit {
 
     this.capturedImage = 'data:image/jpeg;base64,' + capturedImage.base64String;
     this.capturedImageTitle = 'foto';
-    this.fileType = "image/jpeg"
+    this.fileType = "image"
 
     const compressedImage = await this.compressImageBase64(
       this.capturedImage,
@@ -211,7 +235,7 @@ export class NewPublicationPage implements OnInit {
 
   async startVideoRecording() {
     try {
-      let options: CaptureImageOptions = { limit: 1 }
+      let options: CaptureImageOptions = { limit: 5 }
       const data = await this.mediaCapture.captureVideo(options)
       this.video = data[0];
       console.log(data)
@@ -269,21 +293,31 @@ export class NewPublicationPage implements OnInit {
       ({
         multiple: true,
       });
-    let resultUrl = decodeURIComponent(result.files[0].path);
-    this.fileType = result.files[0].mimeType
-    Filesystem.readFile({ path: resultUrl })
+    result.files.forEach(element => {
 
-      .then(async (content) => {
-        console.log(result)
-        console.log(content)
-        this.filecontent = true;
-        if (this.fileType == "video/mp4") {
-          this.capturedVideo = "data:video/mp4;base64," + content.data;
-        } else if (this.fileType == "image/jpg") {
-          this.capturedVideo = "data:image/jpg;base64," + content.data;
-        }
-      })
-      .catch((err) => console.error(err));
+      let resultUrl = decodeURIComponent(element.path);
+      this.fileType = element.mimeType
+      Filesystem.readFile({ path: resultUrl })
+
+        .then(async (content) => {
+          console.log(result)
+          console.log(content)
+          this.filecontent = true;
+          let fileObject = {
+            base64: content.data,
+            fileType: this.fileType
+          }
+          this.seletedContent.push(fileObject)
+
+          if (this.fileType == "video") {
+            this.capturedVideo = "data:video/mp4;base64," + content.data;
+          } else if (this.fileType == "image") {
+            this.capturedVideo = "data:image/jpg;base64," + content.data;
+          }
+        })
+        .catch((err) => console.error(err));
+
+    });
   };
 
 
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 6f737231c..eef8dd532 100644
--- a/src/app/pages/publications/view-publications/view-publications.page.ts
+++ b/src/app/pages/publications/view-publications/view-publications.page.ts
@@ -208,7 +208,8 @@ export class ViewPublicationsPage implements OnInit {
   }
 
   async loadPublication(publicationId, folderId) {
-    let Publication = await this.publications.GetPublicationById(publicationId).toPromise();
+    let Publication = await this.publications.GetPublicationWithArrayOfFilesById(publicationId).toPromise();
+    console.log('Publications with array of file: ', Publication)
     let publicationDetails: Publication = this.publicationPipe.itemList(Publication)
 
     const findIndex = this.publicationFindIndex(publicationId, folderId)
diff --git a/src/app/services/checkFileType.service.spec.ts b/src/app/services/checkFileType.service.spec.ts
new file mode 100644
index 000000000..07d94886f
--- /dev/null
+++ b/src/app/services/checkFileType.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { checkFileTypeService } from './checkFileType.service';
+
+describe('checkFileTypeService', () => {
+  let service: checkFileTypeService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(checkFileTypeService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/src/app/services/checkFileType.service.ts b/src/app/services/checkFileType.service.ts
new file mode 100644
index 000000000..f97f5b2b6
--- /dev/null
+++ b/src/app/services/checkFileType.service.ts
@@ -0,0 +1,36 @@
+import { Injectable } from '@angular/core';
+import { Router } from '@angular/router';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class checkFileTypeService {
+
+  constructor(private router: Router) {
+
+  }
+
+  checkFileType(fileType) {
+    // Convert to lowercase to handle case-insensitivity
+    const lowerCaseType = fileType.toLowerCase();
+ 
+    // Define image and video extensions/types
+    const imageExtensions = ['jpg', 'jpeg', 'png', 'gif', 'bmp','tiff','tif',
+    'image/jpg', 'image/jpeg', 'image/png', 'image/gif', 'image/bmp','image/tiff','image/tif', 'image/*']; // Add more if needed
+    const videoExtensions = ['mp4', 'webm', 'mpg', 'mpeg', 'ogg',
+    'video/mp4', 'video/webm', 'video/mpg', 'video/mpeg', 'video/ogg', 'video/*']; // Add more if needed
+
+    // Check if it's an image
+    if (imageExtensions.includes(lowerCaseType)) {
+      return 'image';
+    }
+
+    // Check if it's a video
+    if (videoExtensions.includes(lowerCaseType)) {
+      return 'video';
+    }
+
+    // If it's neither image nor video
+    return 'null';
+  }
+}
diff --git a/src/app/services/http-error-handle.service.ts b/src/app/services/http-error-handle.service.ts
index c7024ef83..2f05e9767 100644
--- a/src/app/services/http-error-handle.service.ts
+++ b/src/app/services/http-error-handle.service.ts
@@ -17,12 +17,12 @@ export class HttpErrorHandle {
     ) {
       case 0:
         const result = await this.backgroundService.offline()
-        if(result) {
+        if (result) {
           this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
         } else {
-          
+
         }
-        
+
         break;
       case 400:
         this.toastService._badRequest('Lamentamos, mas houve um problema com sua solicitação. Por favor, tente novamente')
@@ -55,12 +55,12 @@ export class HttpErrorHandle {
     ) {
       case 0:
         const result = await this.backgroundService.offline()
-        if(result) {
+        if (result) {
           this.toastService._badRequest('Sem acesso à internet. Por favor verifique sua conexão')
         } else {
-          
+
         }
-        
+
         break;
       case 400:
         this.toastService._badRequest('Lamentamos, mas houve um problema com sua solicitação. Por favor, tente novamente')
@@ -93,12 +93,15 @@ export class HttpErrorHandle {
       case 'diplomaAsDraft':
         this.toastService._badRequest('Este diploma não contem um draft para ser assinado!')
         break;
-  
-        default:
-          this.toastService._badRequest('')
-          break;
-      }
+      case 'filetype':
+        this.toastService._badRequest('Formato de ficheiro inválido!')
+        break;
+
+      default:
+        this.toastService._badRequest('')
+        break;
     }
+  }
 
   httpsSucessMessagge(service: string, callback?: any) {
     switch (service) {
@@ -210,7 +213,7 @@ export class HttpErrorHandle {
       case 'Draft Concluído':
         this.toastService._successMessage('Documento Concluído!');
         break;
-        case 'new event to aprove':
+      case 'new event to aprove':
         this.toastService._successMessage('Enviado para os eventos para aprovação!');
         break;
 
diff --git a/src/app/services/publications.service.ts b/src/app/services/publications.service.ts
index 0299dba24..60d62a34b 100644
--- a/src/app/services/publications.service.ts
+++ b/src/app/services/publications.service.ts
@@ -149,6 +149,19 @@ export class PublicationsService  {
     };
     return this.http.get<any>(`${geturl}`, options);
   }
+
+  GetPublicationWithArrayOfFilesById( publicationId:any){
+    const geturl = environment.apiURL + 'presidentialActions/v2/posts/'+ publicationId;
+    let params = new HttpParams();
+
+    params = params.set("id", publicationId);
+
+    let options = { 
+      headers: this.headers,
+      params: params
+    };
+    return this.http.get<any>(`${geturl}`, options);
+  }
   
 // my own tries
 
diff --git a/src/app/services/shareIntent.ts b/src/app/services/shareIntent.ts
index 3e15640ec..640ee638e 100644
--- a/src/app/services/shareIntent.ts
+++ b/src/app/services/shareIntent.ts
@@ -36,13 +36,9 @@ export class SendIntentService {
 
 
   private onReceive = this.callbackScheduler.function<any>((result)=> {
-    let resultUrl = decodeURIComponent(result.url);
-    Filesystem.readFile({path: resultUrl}).then(async (content) => {
+    this.Router.navigateByUrl("/home/publications");
 
-      this.Router.navigateByUrl("/home/publications");
-
-      window["sharedContent"] = content.data;
-    })
+    window["sharedContent"] = result;
   })
 
 }
diff --git a/src/app/store/publication-folder.service.ts b/src/app/store/publication-folder.service.ts
index 1d40c7ca0..af5ece9ef 100644
--- a/src/app/store/publication-folder.service.ts
+++ b/src/app/store/publication-folder.service.ts
@@ -142,7 +142,7 @@ export class PublicationFolderService {
 
 
   async loadPublication(publicationId, folderId) {
-    let Publication = await this.publications.GetPublicationById(publicationId).toPromise();
+    let Publication = await this.publications.GetPublicationWithArrayOfFilesById(publicationId).toPromise();
     let publicationDetails: Publication = this.publicationPipe.itemList(Publication)
   
     const findIndex = this.publicationFindIndex(publicationId, folderId)