Merge branch 'developer' of https://bitbucket.org/equilibriumito/gabinete-digital into developer

src/app/pages/publications/new-publication/new-publication.page.ts

@@ -19,6 +19,7 @@ import { ThemeService } from 'src/app/services/theme.service';
 import { Camera, CameraResultType, CameraSource, Photo } from '@capacitor/camera';
 
 import { Filesystem, Directory } from '@capacitor/filesystem';
+import { NgxImageCompressService } from "ngx-image-compress";
 
 const IMAGE_DIR = 'stored-images';
 
@@ -72,6 +73,9 @@ export class NewPublicationPage implements OnInit {
   capturedImageTitle: any;
   public photos: any[] = [];
 
+  imgResultBeforeCompress: string;
+  imgResultAfterCompress: string;
+
   constructor(
     private modalController: ModalController,
     public photoService: PhotoService,
@@ -83,6 +87,7 @@ export class NewPublicationPage implements OnInit {
     public ThemeService: ThemeService,
     private platform: Platform,
     private loadingCtrl: LoadingController,
+    public imageCompress: NgxImageCompressService
   ) {
 
     this.publicationType = this.navParams.get('publicationType');
@@ -104,13 +109,13 @@ export class NewPublicationPage implements OnInit {
 
   async takePicture() {
     const image = await Camera.getPhoto({
-      quality: 50,
+      quality: 20,
       allowEditing: false,
       width:50,
       height: 50,
       resultType: CameraResultType.Uri,
       source: CameraSource.Camera // Camera, Photos or Prompt!
-      
+
     });
 
     if (image) {
@@ -120,13 +125,13 @@ export class NewPublicationPage implements OnInit {
   }
 
 
-  imageSize(image){
-      var canvas = document.createElement('canvas');
-      var ctx = canvas.getContext('2d');
-      canvas.width=100
-      canvas.height=34
-      ctx.drawImage(image, 0, 0, 100, 34);
-      document.body.appendChild(canvas);
+  imageSize(image) {
+    var canvas = document.createElement('canvas');
+    var ctx = canvas.getContext('2d');
+    canvas.width = 100
+    canvas.height = 34
+    ctx.drawImage(image, 0, 0, 100, 34);
+    document.body.appendChild(canvas);
   }
 
   convertBlobToBase64 = (blob: Blob) => new Promise((resolve, reject) => {
@@ -394,9 +399,13 @@ export class NewPublicationPage implements OnInit {
 
   async selectImage() {
     const image = await Camera.getPhoto({
+<<<<<<< HEAD
       quality: 50,
       width:50,
       height:50,
+=======
+      quality: 20,
+>>>>>>> 6a912b740d97159664c5fe5dff07ac378b028771
       allowEditing: false,
       resultType: CameraResultType.Uri,
       source: CameraSource.Camera // Camera, Photos or Prompt!
@@ -407,7 +416,7 @@ export class NewPublicationPage implements OnInit {
     }
   }
 
-  
+
 
   // Create a new file from a capture image
   async saveImage(photo: Photo) {
@@ -496,12 +505,43 @@ export class NewPublicationPage implements OnInit {
 
     this.capturedImage = this.images[0].data
 
+    this.compressFile();
+
     loading.dismiss();
 
   }
 
+  /*   compressImage() {
+      let image = this.capturedImage;
+      this.imageCompress.compressFile(image, orientation, 50, 50,).then(() => {
   
+        this.imgResultBeforeCompress = image;
+        console.log('Size in bytes was:', this.imageCompress.byteCount(image));
+  
+        this.imageCompress.compressFile(image, orientation, 50, 50).then(
+          result => {
+            this.imgResultAfterCompress = result;
+            console.log('Size in bytes is now:', this.imageCompress.byteCount(result));
+          }
+        );
+      })
+    } */
+
+  compressFile() {
+
+    //this.imgResultBeforeCompress = image;
+    this.imageCompress.getOrientation(this.capturedImage).then((orientation) => {
+      console.log('Size in bytes was:', this.imageCompress.byteCount(this.capturedImage));
+      this.imageCompress.compressFile(this.capturedImage, orientation, 20, 20).then(
+        result => {
+          this.capturedImage = result;
+          console.log('Size in bytes is now:', this.imageCompress.byteCount(result));
+        }
+      );
+
+    });
+  }
+
 
-  
 
 }

src/app/pages/publications/publications.page.html

@@ -66,7 +66,7 @@
               <ion-item-option class="edit-option" (click)="editAction(viagem.ProcessId)">
                 <button class="btn-no-color">
                   <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="edit" slot="end" src="assets/images/icons-edit.svg" ></ion-icon>
-                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' "  class="edit" slot="end" src="assets/images/theme/gov/cons-edit.svg" ></ion-icon>
+                  <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="edit" slot="end" src="assets/images/theme/gov/icons-edit.svg" ></ion-icon>
 
                 </button>
               </ion-item-option>

src/app/pages/publications/view-publications/view-publications.page.html

@@ -39,7 +39,11 @@
         (click)="goToPublicationDetail(publication.DocumentId)"
       >
         <div *ngIf="publication.FileBase64.length > 30" class="post-img">
+<<<<<<< HEAD
           <img [debug]= "true" [defaultImage] = "defaultImage" [lazyLoad]="publication.FileBase64" src="{{publication.FileBase64}}" alt="image">
+=======
+          <ion-img src="{{publication.FileBase64}}" alt="image"></ion-img>
+>>>>>>> 6a912b740d97159664c5fe5dff07ac378b028771
         </div>
         <div *ngIf="publication.FileBase64.length < 30" class="post-img">
           <img src="/assets/icon/icon-no-image.svg" alt="image">

src/app/pages/publications/view-publications/view-publications.page.ts

@@ -69,6 +69,7 @@ export class ViewPublicationsPage implements OnInit {
       this.folderId = this.folderId['ProcessId']
     }
 
+<<<<<<< HEAD
     
     if (typeof (this.id) == 'object') {
       this.id = this.id['ProcessId']
@@ -78,11 +79,17 @@ export class ViewPublicationsPage implements OnInit {
     setTimeout(() => {
       this.testForkJoin()
       // this.getPublications();
+=======
+    this.getPublicationsIds()
+    this.getPublicationDetail();
+    setTimeout(() => {
+      this.getPublicationsIds();
+>>>>>>> 6a912b740d97159664c5fe5dff07ac378b028771
     }, 1000);
 
-    this.backgroundservice.registerBackService('Online',() => {
+    this.backgroundservice.registerBackService('Online', () => {
       this.getPublicationDetail();
-      this.getPublications();
+      this.getPublicationsIds();
 
     })
 
@@ -99,15 +106,23 @@ export class ViewPublicationsPage implements OnInit {
     // }
     this.testForkJoin()
     this.getPublicationDetail();
+<<<<<<< HEAD
     // this.getPublications();
    
+=======
+    this.getPublicationsIds();
+>>>>>>> 6a912b740d97159664c5fe5dff07ac378b028771
   }
 
   doRefresh = (event) => {
     setTimeout(() => {
       this.testForkJoin()
       this.getPublicationDetail();
+<<<<<<< HEAD
       // this.getPublications();
+=======
+      this.getPublicationsIds();
+>>>>>>> 6a912b740d97159664c5fe5dff07ac378b028771
       event.target.complete();
     }, 3000);
 
@@ -146,6 +161,7 @@ export class ViewPublicationsPage implements OnInit {
 
       this.publicationList = new Array();
 
+<<<<<<< HEAD
       res.forEach(element => {
         console.log('getPublications', element)
         let item: Publication = this.publicationPipe.itemList(element)
@@ -171,6 +187,59 @@ export class ViewPublicationsPage implements OnInit {
     });
   }
 // goes to fork
+=======
+  getPublicationsIds() {
+
+    this.showLoader = true;
+    const folderId = this.folderId
+
+    this.publications.GetPublicationsID(this.folderId).subscribe(res => {
+
+      console.log('publications ids', res)
+      this.publicationList = new Array();
+
+       for(let i of res) {
+         this.publications.GetPublicationById(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 => {
+        console.log('publications elements', element)
+        this.publications.GetPublicationById(element).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(ress);
+        })
+
+      }); */
+
+      this.sqliteservice.updateactions(this.folderId, JSON.stringify(this.publicationList));
+
+      this.publicationListStorage.add(folderId, this.publicationList)
+      this.getpublication = this.publicationList;
+
+      this.showLoader = false;
+
+      /*  this.publicationList = new Array();
+ 
+       res.forEach(element => {
+         console.log('getPublications', element)
+         let item: Publication = this.publicationPipe.itemList(element)
+         this.publicationList.push(item);
+       });
+       this.sqliteservice.updateactions(this.folderId, JSON.stringify(this.publicationList));
+ 
+       this.publicationListStorage.add(folderId, this.publicationList)
+       this.getpublication = this.publicationList; */
+    });
+  }
+
+>>>>>>> 6a912b740d97159664c5fe5dff07ac378b028771
   getPublications() {
 
     this.showLoader = true;
@@ -186,6 +255,8 @@ export class ViewPublicationsPage implements OnInit {
         console.log('getPublications', element)
         let item: Publication = this.publicationPipe.itemList(element)
         this.publicationList.push(item);
+        console.log('getPublications 222', item)
+
       });
       this.sqliteservice.updateactions(this.folderId, JSON.stringify(this.publicationList));
 
@@ -195,7 +266,7 @@ export class ViewPublicationsPage implements OnInit {
       this.showLoader = false;
     }, (error) => {
 
-      if(error.status == '0') {
+      if (error.status == '0') {
         this.getFromDB();
       }
       if (error.status == '404') {
@@ -285,7 +356,7 @@ export class ViewPublicationsPage implements OnInit {
     });
     await modal.present();
     modal.onDidDismiss().then(() => {
-      this.getPublications();
+      this.getPublicationsIds();
     });
   }