merge

src/app/shared/publication/new-publication/new-publication.page.ts

@@ -94,65 +94,26 @@ export class NewPublicationPage implements OnInit {
     const capturedImage = await Camera.getPhoto({
       quality: 90,
       // allowEditing: true,
-      resultType: CameraResultType.Uri,
+      resultType: CameraResultType.Base64,
       source: CameraSource.Camera
     });
-    const response = await fetch(capturedImage.webPath!);
-    const blob = await response.blob();
 
-      this.photos.unshift({
-        filepath: "soon...",
-        webviewPath: capturedImage.webPath
-      });
-      this.capturedImage = await this.convertBlobToBase64(blob);
-      this.capturedImageTitle = new Date().getTime() + '.jpeg';
+      this.capturedImage = 'data:image/jpeg;base64,' +capturedImage.base64String;
+      this.capturedImageTitle = capturedImage.path;
       //console.log(this.capturedImage);
     }
 
-    convertBlobToBase64 = (blob: Blob) => new Promise((resolve, reject) => {
-      const reader = new FileReader;
-      reader.onerror = reject;
-      reader.onload = () => {
-          resolve(reader.result);
-      };
-      reader.readAsDataURL(blob);
-    });
-
     async laodPicture() {
       const capturedImage = await Camera.getPhoto({
-        resultType: CameraResultType.Uri,
-        source: CameraSource.Photos,
         quality: 90,
-        width: 1080,
-        height: 720,
+        resultType: CameraResultType.Base64,
+        source: CameraSource.Photos
       });
 
-      const response = await fetch(capturedImage.webPath!);
-      const blob = await response.blob();
-
-      this.photos.unshift({
-        filepath: "soon...",
-        webviewPath: capturedImage.webPath
-      });
-
-      this.capturedImage = await this.convertBlobToBase64(blob);
-      this.capturedImageTitle = new Date().getTime() + '.jpeg';
+      this.capturedImage = 'data:image/jpeg;base64,' +capturedImage.base64String;
+      this.capturedImageTitle = capturedImage.path;
     }
 
-  /* laodPicture() {
-    const input = this.fileLoaderService.createInput({
-      accept: ['image/apng', 'image/jpeg', 'image/png']
-    })
-
-    input.onchange = async () => {
-      const file = this.fileLoaderService.getFirstFile(input)
-
-      const imageData =  await this.fileToBase64Service.convert(file)
-      this.capturedImage = imageData;
-      this.capturedImageTitle = file.name
-    };
-  } */
-
 
   runValidation() {
     this.validateFrom  = true

src/app/shared/publication/view-publications/view-publications.page.html

@@ -41,7 +41,7 @@
   <div class="main-container px-20">
     <ion-list>
       <div class="post-item  d-md-block mb-10 cursor-pointer"
-        *ngFor="let publication of getpublication"
+        *ngFor="let publication of publicationList"
         (click)="viewPublicationDetail(publication.DocumentId)">
         <div *ngIf="publication.FileBase64.length > 30" class="mb-10 post-img width-md-100">
           <img src="{{publication.FileBase64}}" alt="image">

src/app/shared/publication/view-publications/view-publications.page.ts

@@ -53,7 +53,7 @@ export class ViewPublicationsPage implements OnInit {
       this.folderId = this.folderId['ProcessId']
     }
 
-    this.getPublications();
+    this.getPublicationsIds();
     this.getPublicationDetail();
 
     window['app-view-publications-page-doRefresh'] = this.doRefresh
@@ -67,15 +67,16 @@ export class ViewPublicationsPage implements OnInit {
     console.log('change view to ',this.folderId)
 
     //setTimeout(()=>{
-      this.getPublications();
       this.getPublicationDetail();
+      this.getPublicationsIds();
+      
     //}, 100)
 
 
   }
 
   doRefresh =(event) => {
-    this.getPublications();
+    this.getPublicationsIds();
 
     setTimeout(() => {
       this.getPublicationDetail();
@@ -97,22 +98,22 @@ export class ViewPublicationsPage implements OnInit {
 
     this.showLoader = true;
     const folderId = this.folderId
-    this.getFromDB()
+    //this.getFromDB()
     this.publications.GetPublicationsImages(this.folderId).subscribe(res => {
 
       console.log('publications ids', res)
       this.publicationList = new Array();
 
-      for(let i = 0; i < res.length; i++) {
+      /* for(let i = 0; i < res.length; i++) {
         this.publications.GetPublicationById(res[i]).subscribe(ress => {
           console.log('publications by ids', ress)
           let item: Publication = this.publicationPipe.itemList(ress)
           console.log('publications by ids 2', item)
           this.publicationList.push(item);
         })
-      }
+      } */
 
-      /* res.forEach(element => {
+      res.forEach(element => {
         console.log('publications elements', element)
         this.publications.GetPublicationById(element).subscribe(ress => {
           console.log('publications by ids', ress)
@@ -121,7 +122,7 @@ export class ViewPublicationsPage implements OnInit {
           this.publicationList.push(item);
         })
 
-      }); */
+      });
       console.log('PUBLICATIONS IMAGEs',this.publicationList)
       this.storage.remove('view_publications');
       this.storage.set('view_publications', this.publicationList);
@@ -129,6 +130,8 @@ export class ViewPublicationsPage implements OnInit {
 
       this.getpublication = this.publicationList;
       this.showLoader = false;
+    },() => {
+      this.getFromDB();
     });
   }
 
@@ -142,7 +145,7 @@ export class ViewPublicationsPage implements OnInit {
     this.showLoader = true;
     const folderId = this.folderId
     this.publicationList = new Array();
-    this.getFromDB();
+    //this.getFromDB();
     this.publications.GetPublications(folderId).subscribe(async res=> {
 
       res.forEach(element => {