Git pull made

src/app/pages/chat/chat.module.ts

@@ -29,6 +29,7 @@ import { HeaderPageModule } from 'src/app/shared/header/header.module';
 import { NewEventPageModule } from 'src/app/shared/agenda/new-event/new-event.module';
 import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module';
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { ImageCropperModule } from 'ngx-image-cropper';
 
 @NgModule({
   imports: [
@@ -48,6 +49,7 @@ import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
     GroupContactsPageModule,
     EmptyChatPageModule,
     NewEventPageModule,
+    ImageCropperModule,
     AttendeeModalPageModule,
   ],
   declarations: [

src/app/pages/chat/chat.page.html

@@ -97,8 +97,6 @@
                       <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="icon" slot="start" src="assets/images/icons-chat-group-chat-40.svg"></ion-icon>
                       <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && group._id != idSelected " class="icon" slot="start" src="assets/images/theme/gov/icons-chat-group-chat-40.svg"></ion-icon>
                       <ion-icon *ngIf="ThemeService.currentTheme == 'gov' && group._id == idSelected " class="icon" slot="start" src="assets/images/theme/gov/icons-chat-group-chat-40-hover.svg"></ion-icon>
-
-
                     </div>
                     <div
                      (click)="openGroupMessagesPage(group._id)" class="item-content flex-grow-1 cursor-pointer">
@@ -125,6 +123,7 @@
                     </div>
                   </div>
               </ion-item-sliding>
+            
           </ion-list>
         </div>
        <!--  <button (click)="sendMsg()" style="height: 41px;">Send message</button> -->

src/app/pages/chat/group-messages/group-contacts/group-contacts.page.html

@@ -29,9 +29,6 @@
       </ion-refresher-content>
     </ion-refresher>
 
-
-
-
   <div class="main-content">
     <div *ngIf="members">
       <ion-label class="members-label">Contactos selecção:</ion-label>

src/app/pages/chat/group-messages/group-messages.module.ts

@@ -13,6 +13,8 @@ import { ChatPopoverPageModule } from 'src/app/shared/popover/chat-popover/chat-
 import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
 
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
+import { ImageCropperModule } from 'ngx-image-cropper';
+import { AngularCropperjsModule } from 'angular-cropperjs';
 
 @NgModule({
   imports: [
@@ -24,6 +26,9 @@ import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
     GroupMessagesPageRoutingModule,
     ChatPopoverPageModule,
     BtnModalDismissPageModule,
+    ImageCropperModule,
+    AngularCropperjsModule
+
   ],
   declarations: [GroupMessagesPage]
 })

src/app/pages/chat/group-messages/group-messages.page.html

@@ -57,7 +57,7 @@
       <ion-label>A conversa original mantêm-se como chat individual</ion-label>
     </div>
     <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of messages; let last = last" [class.messages-list-item-wrapper-active]="msg._id == selectedMsgId">
-      <div *ngIf="msg.t != 'r' && msg.t != 'ul' && msg.t != 'ru'" (press)="handlePress(msg._id)" class='message-container incoming-{{msg.u.username!=loggedUser.me.username}}'>
+      <div *ngIf="msg.t != 'r' && msg.t != 'ul' && msg.t != 'ru'" (press)="handlePress(msg._id)" class='message-container incoming-{{msg.u.username!=loggedUser.me.username}}' (click)="openPreview(msg)">
         <div class="title">
           <ion-label>{{msg.u.name}}</ion-label>
           <span class="time">{{showDateDuration(msg._updatedAt)}}</span>
@@ -66,7 +66,7 @@
           <ion-label>{{msg.msg}}</ion-label>
           <div *ngIf="msg.attachments" class="message-attachments">
             <div *ngFor="let file of msg.attachments">
-              <img *ngIf="file.image_url" src="{{file.image_url}}" alt="image">
+              <img *ngIf="file.image_url" src="{{file.image_url}}" alt="image" >
               <div>
                 <div>
                   <div class="file">
@@ -90,7 +90,9 @@
                   </div>
                 </div>
               </div>
+              
             </div>
+            
           </div>
           {{last ? scrollToBottom() : ''}}
         </div>
@@ -152,4 +154,5 @@
       </button>
     </div>
   </div>
+
 </ion-footer>

src/app/pages/chat/group-messages/group-messages.page.scss

@@ -278,3 +278,36 @@
  }
 
 }
+.preview-slides {
+  margin-top: 20%;
+  background: #e6e6e6;
+ 
+  img {
+      padding-top: 20px;
+      padding-bottom: 20px;
+  }
+}
+
+.transparent-modal {
+    .modal-wrapper {
+        --background: rgba(44, 39, 45, 0.2);
+    }
+}
+
+
+.image-slide,
+.image-card {
+    overflow: visible;
+}
+ 
+.image-card {
+    z-index: 9;
+}
+ 
+.backdrop {
+    height: 200%;
+    width: 100%;
+    background: black;
+    position: absolute;
+    z-index: 10;
+}

src/app/pages/chat/group-messages/group-messages.page.ts

@@ -1,5 +1,5 @@
-import { Component, ElementRef, OnInit, ViewChild, AfterViewChecked, AfterViewInit, OnDestroy, } from '@angular/core';
-import { ActionSheetController, MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
+import { Component, ElementRef, OnInit, ViewChild, AfterViewChecked, AfterViewInit, OnDestroy, ChangeDetectorRef, } from '@angular/core';
+import { ActionSheetController, IonSlides, MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
 import { AlertService } from 'src/app/services/alert.service';
 import { AuthService } from 'src/app/services/auth.service';
 import { ChatService } from 'src/app/services/chat.service';
@@ -20,6 +20,7 @@ import { NewEventPage } from '../../agenda/new-event/new-event.page';
 import { EventPerson } from 'src/app/models/eventperson.model';
 import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
 import { ThemeService } from 'src/app/services/theme.service'
+import { PreviewCameraPage } from 'src/app/modals/preview-camera/preview-camera.page';
 
 @Component({
   selector: 'app-group-messages',
@@ -27,6 +28,9 @@ import { ThemeService } from 'src/app/services/theme.service'
   styleUrls: ['./group-messages.page.scss'],
 })
 export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
+
+  
+
   showLoader: boolean;
   isGroupCreated:boolean;
   loggedUser: any;
@@ -75,7 +79,8 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
     private fileToBase64Service: FileToBase64Service,
     private fileService: FileService,
     private toastService: ToastService,
-    public ThemeService: ThemeService
+    public ThemeService: ThemeService,
+    private changeDetectorRef: ChangeDetectorRef
   ) {
     this.loggedUserChat = authService.ValidatedUserChat['data'];
     this.isGroupCreated = true;
@@ -580,4 +585,59 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
   });
   }
 
+  sliderOpts = {
+    zoom: false,
+    slidesPerView: 1.5,
+    spaceBetween: 20,
+    centeredSlides: true
+  };
+  zoomActive = false;
+zoomScale = 1;
+ 
+sliderZoomOpts = {
+  allowSlidePrev: false,
+  allowSlideNext: false,
+  zoom: {
+    maxRatio: 5
+  },
+  on: {
+    zoomChange: (scale, imageEl, slideEl) => {        
+      this.zoomActive = true;
+      this.zoomScale = scale/5;
+      this.changeDetectorRef.detectChanges();         
+    }
+  }
 }
+ 
+async touchEnd(zoomslides: IonSlides, card) {
+  // Zoom back to normal
+  const slider = await zoomslides.getSwiper();
+  const zoom = slider.zoom;
+  zoom.out();
+ 
+  // Card back to normal
+  card.el.style['z-index'] = 9;
+ 
+  this.zoomActive = false;
+  this.changeDetectorRef.detectChanges();
+}
+ 
+touchStart(card) {
+  // Make card appear above backdrop
+  card.el.style['z-index'] = 11;
+}
+
+  async openPreview(img) {
+    const modal = await this.modalController.create({
+      component:  PreviewCameraPage,
+      cssClass: 'transparent-modal',
+      componentProps: {
+        image: img.attachments[0].image_url,
+        username: img.u.username,
+        _updatedAt: img._updatedAt
+      }
+    });
+    modal.present();
+  }
+}
+

src/app/pages/chat/messages/messages.page.html

@@ -50,8 +50,8 @@
   </ion-refresher> -->
   <div (click)="handleClick()" class="messages" #scrollMe>
     <div class="messages-list-item-wrapper container-width-100" *ngFor="let msg of chatMessageStore.message[roomId]; let last = last"
-    [class.messages-list-item-wrapper-active]="msg._id == selectedMsgId">
-      <div (press)="handlePress(msg._id)" class='message-container incoming-{{msg.u.username!=loggedUser.me.username}}'>
+    [class.messages-list-item-wrapper-active]="msg._id == selectedMsgId"  >
+      <div (press)="handlePress(msg._id)" class='message-container incoming-{{msg.u.username!=loggedUser.me.username}}' (click)="openPreview(msg)">
         <div class="title">
           <ion-label>{{msg.u.name}}</ion-label>
           <span class="time">{{showDateDuration(msg._updatedAt)}}</span>
@@ -138,6 +138,7 @@
   <button (click)="stopRecording()">Stop Recording</button> -->
   <div class="container width-100 d-flex">
     <div>
+    
       <button class="btn-no-color" (click)="openChatOptions()">
         <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="chat-icon-options" src="assets/images/icons-add.svg"></ion-icon>
         <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="chat-icon-options" src="assets/images/theme/gov/icons-add.svg"></ion-icon>
@@ -163,4 +164,5 @@
       </button>
     </div>
   </div>
+
 </ion-footer>

src/app/pages/chat/messages/messages.page.ts

@@ -1,6 +1,6 @@
-import { AfterViewChecked, AfterViewInit, Component, ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/core';
+import { AfterViewChecked, AfterViewInit, ChangeDetectorRef, Component, ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import {ActivatedRoute, Router} from '@angular/router'
-import { GestureController, Gesture, ModalController, NavParams, PopoverController } from '@ionic/angular';
+import { GestureController, Gesture, ModalController, NavParams, PopoverController, IonSlides } from '@ionic/angular';
 import { map } from 'rxjs/operators';
 import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
 import { EventPerson } from 'src/app/models/eventperson.model';
@@ -23,6 +23,7 @@ import { ThemeService } from 'src/app/services/theme.service'
 import { Filesystem, Directory, Encoding } from '@capacitor/filesystem';
 import { VoiceRecorder, VoiceRecorderPlugin, RecordingData, GenericResponse, CurrentRecordingStatus } from 'capacitor-voice-recorder';
 import { Haptics, ImpactStyle } from '@capacitor/haptics';
+import { PreviewCameraPage } from 'src/app/modals/preview-camera/preview-camera.page';
 
 const IMAGE_DIR = 'stored-images';
 
@@ -85,7 +86,8 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     private fileService: FileService,
     private gestureController: GestureController,
     private processes: ProcessesService,
-    public ThemeService: ThemeService
+    public ThemeService: ThemeService,
+    private changeDetectorRef: ChangeDetectorRef
   ) {
     this.loggedUser = authService.ValidatedUserChat['data'];
     this.roomId = this.navParams.get('roomId');
@@ -590,4 +592,62 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     });
   }
 
+  
+  sliderOpts = {
+    zoom: false,
+    slidesPerView: 1.5,
+    spaceBetween: 20,
+    centeredSlides: true
+  };
+  zoomActive = false;
+zoomScale = 1;
+ 
+sliderZoomOpts = {
+  allowSlidePrev: false,
+  allowSlideNext: false,
+  zoom: {
+    maxRatio: 5
+  },
+  on: {
+    zoomChange: (scale, imageEl, slideEl) => {        
+      this.zoomActive = true;
+      this.zoomScale = scale/5;
+      this.changeDetectorRef.detectChanges();         
+    }
+  }
 }
+ 
+async touchEnd(zoomslides: IonSlides, card) {
+  // Zoom back to normal
+  const slider = await zoomslides.getSwiper();
+  const zoom = slider.zoom;
+  zoom.out();
+ 
+  // Card back to normal
+  card.el.style['z-index'] = 9;
+ 
+  this.zoomActive = false;
+  this.changeDetectorRef.detectChanges();
+}
+ 
+touchStart(card) {
+  // Make card appear above backdrop
+  card.el.style['z-index'] = 11;
+}
+
+  async openPreview(msg) {
+    const modal = await this.modalController.create({
+      component:  PreviewCameraPage,
+      cssClass: 'transparent-modal',
+      componentProps: {
+        image: msg.attachments[0].image_url,
+        username: msg.u.username,
+        _updatedAt: msg._updatedAt
+      }
+    });
+    modal.present();
+  }
+}
+
+
+

src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html

@@ -1,4 +1,4 @@
-<ion-header class="ion-no-border px-20">
+<ion-header class="ion-no-border">
   <app-header></app-header>
 </ion-header>
 <ion-content>

src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts

@@ -535,7 +535,15 @@ export class DespachoPrPage implements OnInit {
       backdropDismiss: false
     });
     await modal.present();
-    modal.onDidDismiss();
+    modal.onDidDismiss().then(res => {
+      if(res){
+        const data = res.data;
+        if(data == 'close') {
+          this.goBack();
+        }
+      }
+
+    });
   }
 
   async distartExpedientModal() {

src/app/pages/gabinete-digital/gabinete-digital.page.html

@@ -181,7 +181,7 @@
 
 
             <!-- <div *ngIf="p.userRole(['MDGPR'])" (click)="openExpedientesPrPage(); selectedElement='ExpedientesPr'" [class.active]="selectedElement == 'ExpedientesPr'" class="exp-card-long justify-center width-100 white-background">
-              <div class="center-div">
+              <div class="center-div">F
                 <div class="exp-card-icon">
                   <ion-icon  src="assets/images/icons-expediente-presidente.svg"></ion-icon>
                 </div>
@@ -217,7 +217,7 @@
               </div>
               <p class="text-center exp-card-title " *ngIf="loggeduser.Profile == 'MDGPR' ">Diplomas por Validar</p>
               <p class="text-center exp-card-title " *ngIf="loggeduser.Profile == 'PR'">Diplomas por Assinar</p>
-              <p class="text-center exp-card-content">{{ deplomasStore.deplomasReviewCount }} bug <span class="title1">Documentos</span> </p>
+              <p class="text-center exp-card-content">{{ deplomasStore.deplomasReviewCount }} <span class="title1">Documentos</span> </p>
             </div>
 
             <div *ngIf="loggeduser.Profile == 'MDGPR'" (click)="openDiplomasPage('assinados'); selectedElement='DiplomasAssinados'" [class.active]="selectedElement == 'DiplomasAssinados'" class="box-hover exp-card d-flex flex-column justify-center">

src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts

@@ -537,7 +537,15 @@ export class PedidoPage implements OnInit {
       backdropDismiss: false
     });
     await modal.present();
-    modal.onDidDismiss();
+    modal.onDidDismiss().then(res => {
+      if(res){
+        const data = res.data;
+        if(data == 'close') {
+          this.goBack();
+        }
+      }
+
+    });
   }
 
   async openForwardModal(task: any) {

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

@@ -1,5 +1,4 @@
 
-
 <ion-content>
   <div class="content-container d-flex flex-column">
     <div class="title-content width-100">
@@ -23,12 +22,19 @@
           </div>
         </div>
       </div>
+      
       <div *ngIf="capturedImage != '' " class="ion-item-container-no-border">
         <ion-label class="attached-title">Fotografia Anexada </ion-label>
 
         <ion-item lines="none">
           <ion-thumbnail slot="start">
-            <ion-img [(ngModel)]="capturedImage" name="image" ngDefaultControl [src]="capturedImage"></ion-img>
+          
+              <ion-img [(ngModel)]="capturedImage" name="image" ngDefaultControl [src]="photo" (click)="openPreview(photo)" ></ion-img>
+              <ion-row>
+                <ion-col>
+                  <img src="" #imageElement/>
+                </ion-col>
+              </ion-row>
           </ion-thumbnail>
           <ion-label>
             <p>{{capturedImageTitle}}</p>
@@ -68,7 +74,7 @@
           </ion-label>
       </div>
 
-      <div class="ion-item-container-no-border">
+      <!-- <div class="ion-item-container-no-border">
         <ion-label (click)="selectImage()" class="cursor-pointer">
           <div class="attach-icon">
             <ion-icon *ngIf="ThemeService.currentTheme == 'default' " src="assets/images/icons-add-photos.svg"></ion-icon>
@@ -77,15 +83,14 @@
           <div class="attach-document cursor-pointer">
             <ion-label>Anexar Fotografia</ion-label>
           </div>
-        </ion-label>
-      </div>
+      </ion-label> 
+      </div> -->
     </div>
 
   </div>
 
 </ion-content>
 
-
 <ion-footer class="ion-no-border">
   <ion-toolbar class="footer-toolbar">
     <ion-buttons slot="start">

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

@@ -104,7 +104,7 @@ export class NewPublicationPage implements OnInit {
 
   async takePicture() {
     const image = await Camera.getPhoto({
-      quality: 90,
+      quality: 50,
       allowEditing: false,
       resultType: CameraResultType.Uri,
       source: CameraSource.Camera // Camera, Photos or Prompt!

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

@@ -0,0 +1,4 @@
+export interface Photos {
+  filepath: string;
+  webviewPath: string;
+}

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

@@ -34,7 +34,7 @@
   <div class="main-container background-white height-100 overflow-y-auto">
     <ion-list>
       <!-- [routerLink]="['/home/publications/view-publications/publication-detail', publication.publicationId]" -->
-      <div class="post-item"
+      <div class="post-item cursor-pointer"
         *ngFor="let publication of getpublication"
         (click)="goToPublicationDetail(publication.DocumentId)"
       >

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

@@ -69,7 +69,7 @@ export class ViewPublicationsPage implements OnInit {
     this.getPublicationDetail();
     setTimeout(() => {
       this.getPublications();
-    }, 5000);
+    }, 1000);
 
     this.backgroundservice.registerBackService('Online',() => {
       this.getPublicationDetail();
@@ -110,23 +110,27 @@ export class ViewPublicationsPage implements OnInit {
   getPublicationDetail() {
 
     setTimeout(() => {
+
       let allActions = this.publicationEventFolderStorage.list.concat(this.publicationTravelFolderService.list)
       this.item = allActions.find((e) => e.ProcessId == this.folderId);
       this.publicationDitails = this.item
       console.log('item', this.item)
+
     }, 100);
 
   }
 
   getPublications() {
+
     this.showLoader = true;
     const folderId = this.folderId
+
     this.publications.GetPublications(this.folderId).subscribe(res => {
+
       console.log(this.folderId)
 
       this.publicationList = new Array();
 
-
       res.forEach(element => {
         console.log('getPublications', element)
         let item: Publication = this.publicationPipe.itemList(element)
@@ -134,26 +138,22 @@ export class ViewPublicationsPage implements OnInit {
       });
       this.sqliteservice.updateactions(this.folderId, JSON.stringify(this.publicationList));
 
-
       this.publicationListStorage.add(folderId, this.publicationList)
       this.getpublication = this.publicationList;
 
       this.showLoader = false;
-    },
-      (error) => {
-        if(error.status == '0') {
-          this.getFromDB();
-        }
-        if (error.status == '404') {
-          this.error = 'Sem publicações disponíveis!';
-          this.publicationList = [];
-          this.publicationListStorage.add(folderId, this.publicationList)
-        }
-
-        this.showLoader = false;
-
-      });
+    }, (error) => {
 
+      if(error.status == '0') {
+        this.getFromDB();
+      }
+      if (error.status == '404') {
+        this.error = 'Sem publicações disponíveis!';
+        this.publicationList = [];
+        this.publicationListStorage.add(folderId, this.publicationList)
+      }
+      this.showLoader = false;
+    });
   }
 
   getFromDB() {