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

src/app/app.module.ts

@@ -67,6 +67,7 @@ import { StreamingMedia } from '@ionic-native/streaming-media/ngx';
 import { PhotoViewer } from '@ionic-native/photo-viewer/ngx';
 import {NgxImageCompressService} from 'ngx-image-compress';
 import { CustomImageCachePageRoutingModule } from './services/file/custom-image-cache/custom-image-cache-routing.module';
+import { IonicImageLoaderComponent, IonicImageLoaderModule } from 'ionic-image-loader-v5';
 
 /* import { FCM } from '@ionic-native/fcm/ngx';
 import { FirebaseX } from '@ionic-native/firebase-x/ngx'; */
@@ -82,10 +83,13 @@ import { FirebaseX } from '@ionic-native/firebase-x/ngx'; */
       provide: DateAdapter,
       useFactory: adapterFactory
     }),
+
+    IonicImageLoaderModule,
     IonicModule.forRoot({animated: false}),
     IonicStorageModule.forRoot({
       name: '__mydb',
       driverOrder: ['indexeddb', 'sqlite', 'websql']
+
  }),
 
     AppRoutingModule,

src/app/guards/auth.guard.ts

@@ -19,10 +19,12 @@ export class AuthGuard implements CanActivate {
     route: ActivatedRouteSnapshot,
     state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
 
+    // if user not active
     if(!SessionStore.user.Inactivity) {
       this.router.navigate(['/']);
       return false
     }
+    // if session doesn't exit
     else if(!SessionStore.exist) {
       this.router.navigate(['/']);
       return false

src/app/models/chatMethod.ts

@@ -59,7 +59,7 @@ interface FirstUnread {
     msg: string;
     ts: Ts2;
     u: U2;
-    _updatedAt: UpdatedAt2;
+    _updatedAt: string;
     mentions: any[];
     channels: any[];
 }
@@ -72,7 +72,7 @@ export interface Message {
     ts: Ts;
     u: U;
     t: string;
-    _updatedAt: UpdatedAt;
+    _updatedAt: '';
     mentions: any[];
     channels: any[];
     attachments: Attachment[];
@@ -80,6 +80,7 @@ export interface Message {
     editedAt: EditedAt;
     editedBy: EditedBy;
     urls: any[];
+    temporaryData: object
 }
 
 
@@ -232,7 +233,7 @@ interface FirstUnread {
     msg: string;
     ts: Ts2;
     u: U2;
-    _updatedAt: UpdatedAt2;
+    _updatedAt: string;
     mentions: any[];
     channels: any[];
 }
@@ -245,7 +246,7 @@ export interface Message {
     ts: Ts;
     u: U;
     t: string;
-    _updatedAt: UpdatedAt;
+    _updatedAt: '';
     mentions: any[];
     channels: any[];
     attachments: Attachment[];

src/app/pages/agenda/agenda.page.ts

@@ -9,6 +9,7 @@ import { momentG } from 'src/plugin/momentG';
 import { DomSanitizer } from "@angular/platform-browser";
 import { EventPerson } from 'src/app/models/eventperson.model';
 import { removeDuplicate } from 'src/plugin/removeDuplicate.js';
+import { Storage } from '@ionic/storage';
 
 // showTimeline
 import { setHours, setMinutes } from 'date-fns';
@@ -179,7 +180,8 @@ export class AgendaPage implements OnInit {
     private sqliteservice: SqliteService,
     private platform: Platform,
     private backgroundservice: BackgroundService,
-    public ThemeService: ThemeService
+    public ThemeService: ThemeService,
+    private storage:Storage
   ) {
 
     this.dateAdapter.setLocale('es');
@@ -770,6 +772,27 @@ export class AgendaPage implements OnInit {
 
   addEventToDB(response, profile) {
     if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
+      let responseArray = [];
+        response.forEach(element => {
+          let event = {
+            CalendarId: element.CalendarId,
+            CalendarName: element.CalendarName,
+            EndDate: element.EndDate,
+            EventId: element.EventId,
+            HasAttachments: element.HasAttachments,
+            HumanDate: element.HumanDate,
+            IsAllDayEvent: element.IsAllDayEvent,
+            Location: element.Location,
+            StartDate: element.StartDate,
+            Subject: element.Subject,
+            Profile: profile
+          }
+          responseArray.push(event)
+
+        });
+      this.storage.set('agendaResponse',responseArray).then(() => {
+        console.log('Agenda data saved')
+      })
     } else {
       if (response.length > 0) {
 
@@ -796,21 +819,35 @@ export class AgendaPage implements OnInit {
 
   getFromDB() {
     console.log('ALL EVENTS FROM DB AGENDA OFFLINE')
-    this.sqliteservice.getAllEvents().then((events: any[]) => {
-      console.log('ALL EVENTS FROM DB', events)
-      let eventArray = [];
-
-      this.trasnformDataDB(events)
-      this.updateEventListBox()
-
-      this.myCal.update();
-      this.myCal.loadEvents();
-
-      this.showLoader = false;
-      this.showTimeline = true;
-
-
-    })
+    if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
+      this.storage.get('agendaResponse').then((events) => {
+        this.trasnformDataDB(events)
+        this.updateEventListBox()
+  
+        this.myCal.update();
+        this.myCal.loadEvents();
+  
+        this.showLoader = false;
+        this.showTimeline = true;
+      })
+    } else {
+      this.sqliteservice.getAllEvents().then((events: any[]) => {
+        console.log('ALL EVENTS FROM DB', events)
+        let eventArray = [];
+  
+        this.trasnformDataDB(events)
+        this.updateEventListBox()
+  
+        this.myCal.update();
+        this.myCal.loadEvents();
+  
+        this.showLoader = false;
+        this.showTimeline = true;
+  
+  
+      })
+    }
+    
   }
 
   updateEventListBox() {

src/app/pages/agenda/view-event/view-event.page.ts

@@ -21,6 +21,7 @@ import { BackgroundService } from 'src/app/services/background.service';
 import { StorageService } from 'src/app/services/storage.service';
 import { ThemeService } from 'src/app/services/theme.service'
 import { RouteService } from 'src/app/services/route.service';
+import { Storage } from '@ionic/storage';
 
 
 @Component({
@@ -74,6 +75,7 @@ export class ViewEventPage implements OnInit {
     private storage: StorageService,
     public ThemeService: ThemeService,
     private RouteService: RouteService,
+    private ionicStorage: Storage
   ) {
     this.isEventEdited = false;
     this.loadedEvent = new Event();
@@ -394,6 +396,9 @@ export class ViewEventPage implements OnInit {
 
   addEventToDb(data) {
     if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
+      this.ionicStorage.set('eventDetails', data).then(() => {
+        console.log('Details event saved')
+      })
     } else {
       let event = {
         Attendees: JSON.stringify(data.Attendees) || JSON.stringify(''),
@@ -423,33 +428,40 @@ export class ViewEventPage implements OnInit {
 
   getFromDb() {
     const loader = this.toastService.loading();
-    this.sqliteservice.getEventById(this.eventId).then((event) => {
-      let arrayevent = [];
-      console.log('EVENT ATTENDEES',event[0].Attendees)
-      let elemet = {
-        Attendees: (typeof JSON.parse(event[0].Attendees) === 'undefined') ? "" : JSON.parse(event[0].Attendees),
-        Body: JSON.parse(event[0].Body) || "",
-        CalendarId: event[0].CalendarId,
-        CalendarName: event[0].CalendarName,
-        Category: event[0].Category,
-        EndDate: event[0].EndDate,
-        EventId: event[0].EventId,
-        EventRecurrence: JSON.parse(event[0].EventRecurrence) || "",
-        EventType: event[0].EventType,
-        HasAttachments: event[0].HasAttachments,
-        IsAllDayEvent: event[0].IsAllDayEvent,
-        IsMeeting: event[0].IsMeeting,
-        IsRecurring: event[0].IsRecurring,
-        Location: event[0].Location,
-        Organizer: JSON.parse(event[0].Organizer) || "",
-        StartDate: event[0].StartDate,
-        Subject: event[0].Subject,
-        TimeZone: event[0].TimeZone
-      }
-      arrayevent.push(elemet);
-      this.loadedEvent = arrayevent[0];
-      console.log("Event ditails local,", elemet)
-    })
+    if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
+      this.ionicStorage.get('eventDetails').then((events) =>{
+        this.loadedEvent = events;
+      })
+    } else {
+      this.sqliteservice.getEventById(this.eventId).then((event) => {
+        let arrayevent = [];
+        console.log('EVENT ATTENDEES',event[0].Attendees)
+        let elemet = {
+          Attendees: (typeof JSON.parse(event[0].Attendees) === 'undefined') ? "" : JSON.parse(event[0].Attendees),
+          Body: JSON.parse(event[0].Body) || "",
+          CalendarId: event[0].CalendarId,
+          CalendarName: event[0].CalendarName,
+          Category: event[0].Category,
+          EndDate: event[0].EndDate,
+          EventId: event[0].EventId,
+          EventRecurrence: JSON.parse(event[0].EventRecurrence) || "",
+          EventType: event[0].EventType,
+          HasAttachments: event[0].HasAttachments,
+          IsAllDayEvent: event[0].IsAllDayEvent,
+          IsMeeting: event[0].IsMeeting,
+          IsRecurring: event[0].IsRecurring,
+          Location: event[0].Location,
+          Organizer: JSON.parse(event[0].Organizer) || "",
+          StartDate: event[0].StartDate,
+          Subject: event[0].Subject,
+          TimeZone: event[0].TimeZone
+        }
+        arrayevent.push(elemet);
+        this.loadedEvent = arrayevent[0];
+        console.log("Event ditails local,", elemet)
+      })
+    }
+    
     loader.remove()
   }
 }

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

@@ -143,8 +143,8 @@ export class ChatPage implements OnInit {
 
   ngOnInit() {
 
-    console.log(this.wsChatMethodsService.dm);
-    console.log(this.wsChatMethodsService.group);
+    console.log('Rooms INDIVIDUAIS',this.wsChatMethodsService._dm);
+    console.log(' ROOMS GROUP',this.wsChatMethodsService._group);
 
 
     this.segment = "Contactos";
@@ -159,11 +159,6 @@ export class ChatPage implements OnInit {
 
     let t = this.showDateDuration(new Date());
 
-    this.setStatus('away');
-    /* if(this.dataService.get("newGroup")){
-      this.openNewGroupPage();
-    } */
-
     this.router.events.forEach((event) => {
       if (event instanceof NavigationStart && event.url.startsWith('/home/chat')) {
         if (this.dataService.get("newGroup")) {

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

@@ -102,7 +102,7 @@
           <div *ngIf="msg.attachments" class="message-attachments">
             <div *ngFor="let file of msg.attachments">
               <div *ngIf="msg.file.type == 'application/img'" (click)="openPreview(msg)">
-                <img *ngIf="msg.image_url" src="{{msg.image_url}}" alt="image" >
+                <img *ngIf="msg.file.image_url" src="{{msg.file.image_url}}" alt="image" >
                 <ion-icon *ngIf="msg.file.image_url == null" name="download-outline"></ion-icon>
               </div>
               <div *ngIf="msg.file.type != 'application/img'">
@@ -121,7 +121,7 @@
                     <ion-label *ngIf="msg.file">
                       <span *ngIf="file.description">{{file.description}}</span>
                       <span *ngIf="file.description && msg.file.type != 'application/webtrix'"> • </span>
-                      <span *ngIf="msg.file.type != 'application/webtrix'">{{msg.file.type.replace('application/','').toUpperCase()}}</span>
+                      <span *ngIf="msg.file.type != 'application/webtrix'">{{msg.displayType}}</span>
                     </ion-label>
                   </div>
               </div>

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

@@ -20,12 +20,18 @@ 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';
 import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
 import { ViewEventPage } from 'src/app/modals/view-event/view-event.page';
 import { HttpEventType } from '@angular/common/http';
 import { SqliteService } from 'src/app/services/sqlite.service';
 import { WsChatMethodsService } from 'src/app/services/chat/ws-chat-methods.service';
+import { AttachmentsService } from 'src/app/services/attachments.service';
+import { FileType } from 'src/app/models/fileType';
+import { Storage } from '@ionic/storage';
+
+import { CameraService } from 'src/app/services/camera.service';
+import { SearchPage } from 'src/app/pages/search/search.page';
+import { ProcessesService } from 'src/app/services/processes.service';
 
 @Component({
   selector: 'app-group-messages',
@@ -87,7 +93,12 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
     private changeDetectorRef: ChangeDetectorRef,
     private sqlservice: SqliteService,
     private platform: Platform,
-    public wsChatMethodsService: WsChatMethodsService
+    public wsChatMethodsService: WsChatMethodsService,
+    private AttachmentsService: AttachmentsService,
+    private storage: Storage,
+    private processesService: ProcessesService,
+    
+    private CameraService: CameraService,
   ) {
     this.loggedUserChat = authService.ValidatedUserChat['data'];
     this.isGroupCreated = true;
@@ -118,6 +129,9 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
     this.getChatMembers();
 
     this.getRoomMessageDB(this.roomId);
+    this.wsChatMethodsService.getUserOfRoom(this.roomId).then((value) => {
+      console.log('MEMBER', value)
+    })
   }
 
   setStatus(status:string){
@@ -237,7 +251,6 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
         this.roomCountDownDate = this.timeService.countDownDateTimer(this.room.customFields.countDownDate, this.room._id);
       }
       this.getGroupContacts(this.room);
-      this.loadGroupMessages(this.room);
       this.showLoader = false;
     });
   }
@@ -286,27 +299,6 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
     }
   }
 
-  loadGroupMessages(room:any){
-    this.showLoader = true;
-    //If group is private call getGroupMembers
-    if(this.room.t === 'p'){
-      this.chatService.getPrivateGroupMessages(this.roomId).subscribe(res=>{
-        console.log(res);
-        let msgOnly = res['messages'].filter(data => data.t != 'au');
-        //this.messages = msgOnly.reverse();
-        this.transformDataMSG(msgOnly.reverse());
-      this.getRoomMessageDB(this.roomId);
-        this.showLoader = false;
-      });
-    }
-    //Otherwise call getChannelMembers for públic groups
-    /* else{
-      this.chatService.getPublicGroupMessages(this.roomId).subscribe(res=>{
-        console.log(res);
-        this.messages = res['messages'].reverse();
-      });
-    } */
-  }
 
   showDateDuration(start:any){
     return this.timeService.showDateDuration(start);
@@ -327,7 +319,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
 
 
   sendMessage() {
-    this.wsChatMethodsService.getGroupRoom(this.roomId).send()
+    this.wsChatMethodsService.getGroupRoom(this.roomId).send({})
   }
 
   async openOptions() {
@@ -354,42 +346,6 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
     });
   }
 
-  loadPicture() {
-    const input = this.fileLoaderService.createInput({
-      accept: ['image/apng', 'image/jpeg', 'image/png']
-    })
-
-    input.onchange = async () => {
-      const file = this.fileLoaderService.getFirstFile(input)
-
-      console.log(file);
-
-      const imageData =  await this.fileToBase64Service.convert(file)
-      this.capturedImage = imageData;
-      this.capturedImageTitle = file.name;
-
-      let body = {
-        "message":
-        {
-          "rid": this.roomId,
-          "msg": "",
-          "attachments": [{
-            //"title": this.capturedImageTitle ,
-            //"text": "description",
-            "title_link_download": false,
-            "image_url": this.capturedImage,
-          }]
-        }
-      }
-
-      this.chatService.sendMessage(body).subscribe(res=> {
-        console.log(res);
-      },(error) => {
-
-      });
-      //console.log(this.capturedImage)
-    };
-  }
 
   viewDocument(file:any, url?:string){
 
@@ -481,8 +437,119 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
     }
   }
 
+  
+
+  async takePicture() {
+    const roomId = this.roomId
+    
+    const image = await this.CameraService.takePicture();
+    await this.fileService.saveImage(image)
+    const lastphoto: any = await this.fileService.loadFiles();
+    const { capturedImage, capturedImageTitle} = await this.fileService.loadFileData(lastphoto);
+    const base64 = await fetch(capturedImage);
+    const blob = await base64.blob();
+    const formData = new FormData();
+    formData.append("blobFile", blob);
+
+    this.wsChatMethodsService.getDmRoom(roomId).send({
+      file: {
+        "type": "application/img",
+        "guid": '',
+        "image_url": capturedImage
+      },
+      temporaryData: formData,
+      attachments: [{
+        "title": capturedImageTitle ,
+        "image_url": capturedImage, // rocketchat
+        "text": "description",
+        "title_link_download": false,
+      }]
+    })
+
+  }
+  
+  async addImage() {
+    this.addFileToChat(['image/apng', 'image/jpeg', 'image/png'])
+  }
+  
+  async addFile() {
+    this.addFileToChat(['.doc', '.docx', '.pdf'])
+  }
+
+  async addFileWebtrix() {
+    const modal = await this.modalController.create({
+      component: SearchPage,
+      cssClass: 'group-messages modal-desktop search-modal search-modal-to-desktop',
+      componentProps: {
+        type: 'AccoesPresidenciais & ArquivoDespachoElect',
+        select: true,
+        showSearchInput: true,
+      }
+    });
+    await modal.present();
+    modal.onDidDismiss().then(async res=>{
+      const data = res.data;
+
+      if(data.selected) {
+        const loader = this.toastService.loading();
+
+        this.wsChatMethodsService.getDmRoom(this.roomId).send({
+          file:{
+            "name": res.data.selected.Assunto,
+            "type": "application/webtrix",
+            "ApplicationId": res.data.selected.ApplicationType,
+            "DocId": res.data.selected.Id,
+            "Assunto": res.data.selected.Assunto,
+          },
+          attachments: [{
+            "title": res.data.selected.Assunto,
+            "description": res.data.selected.DocTypeDesc,
+            // "title_link": url_no_options,
+            "title_link_download": true,
+            //"thumb_url": "assets/images/webtrix-logo.png",
+            // "message_link": url_no_options,
+            "type": "webtrix",
+            //"thumb_url": "assets/images/webtrix-logo.png",
+            "text": res.data.selected.DocTypeDesc,
+            "thumb_url": "https://static.ichimura.ed.jp/uploads/2017/10/pdf-icon.png",
+          }]
+        })
+
+
+        loader.remove();
+
+      }
+    });
+  }
+
+
+  async addFileToChat(types: typeof FileType[] ) {
+    const file: any = await this.fileService.getFileFromDevice(types);
+    const imageData =  await this.fileToBase64Service.convert(file)
+
+    const formData = new FormData();
+    formData.append("blobFile", file);
+    
+    this.wsChatMethodsService.getDmRoom(this.roomId).send({
+      file: {
+        "type": "application/img",
+        "guid": '',
+        "image_url": imageData
+      },
+      temporaryData: formData,
+      attachments: [{
+        "title": file.name ,
+        "text": "description",
+        "image_url": imageData,
+        "title_link_download": false,
+      }]
+    })
+
+  }
+  
   async openChatOptions(ev?: any) {
     console.log(this.members);
+    const roomId = this.roomId;
 
     const popover = await this.popoverController.create({
       component: ChatOptionsPopoverPage,
@@ -496,29 +563,25 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
       translucent: true
     });
     await popover.present();
-    await popover.onDidDismiss().then((res)=>{
+    await popover.onDidDismiss().then( async(res)=>{
       console.log(res['data']);
-      if(res['data'] == 'meeting'){
+      if (res['data'] == 'meeting') {
         this.bookMeeting();
       }
-      else if(res['data'] == 'take-picture'){
-        this.fileService.addCameraPictureToChat(this.roomId);
-        //this.loadPicture();
+      else if (res['data'] == 'take-picture') {
+        this.takePicture()
       }
-      else if(res['data'] == 'add-picture'){
-        this.fileService.addPictureToChatMobile(this.roomId);
-        //this.loadPicture();
-      }
-      else if(res['data'] == 'add-document'){
-        this.fileService.addDocumentToChat(this.roomId);
-        //this.loadDocument();
-      }
-      else if(res['data'] == 'documentoGestaoDocumental'){
+      else if (res['data'] == 'add-picture') {
+        this.addImage()
 
-        this.fileService.addDocGestaoDocumentalToChat(this.roomId);
-        //this.addDocGestaoDocumental();
       }
-      this.loadGroupMessages(this.roomId);
+      else if (res['data'] == 'add-document') {
+        this.addFile()
+      }
+      else if (res['data'] == 'documentoGestaoDocumental') {
+
+        this.addFileWebtrix()
+      }
     });
   }
 
@@ -742,7 +805,7 @@ downloadFileMsg(msg) {
   console.log('FILE TYPE', msg.file.type)
   this.downloadFile = "";
   if (msg.file.type == "application/img") {
-    this.fileService.downloadFile(msg.file.guid).subscribe(async (event) => {
+    this.AttachmentsService.downloadFile(msg.file.guid).subscribe(async (event) => {
       console.log('FILE TYPE 22', msg.file.guid)
       var name = msg.file.guid;
 

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

@@ -102,7 +102,7 @@
                     <ion-label *ngIf="msg.file && msg.file != ''">
                       <span *ngIf="file.description">{{file.description}}</span>
                       <span *ngIf="file.description && msg.file.type != 'application/webtrix'"> • </span>
-                      <span *ngIf="msg.file.type != 'application/webtrix'">{{msg.file.type.replace('application/','').toUpperCase()}}</span>
+                      <span *ngIf="msg.file.type != 'application/webtrix'">{{msg.displayType}}</span>
                     </ion-label>
                   </div>
               </div>

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

@@ -1,11 +1,10 @@
 import { AfterViewChecked, AfterViewInit, ChangeDetectorRef, Component, ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router'
-import { GestureController, Gesture, ModalController, NavParams, PopoverController, IonSlides, Platform } from '@ionic/angular';
+import { GestureController, Gesture, ModalController, NavParams, PopoverController, Platform } 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';
 import { ExpedientTaskModalPageNavParamsTask } from 'src/app/models/ExpedientTaskModalPage';
-import { SearchDocumentDetails, SearchFolderDetails } from 'src/app/models/search-document';
 import { ContactsPage } from 'src/app/pages/chat/messages/contacts/contacts.page';
 import { AlertService } from 'src/app/services/alert.service';
 import { AuthService } from 'src/app/services/auth.service';
@@ -31,6 +30,14 @@ import { HttpEventType } from '@angular/common/http';
 import { ViewEventPage } from 'src/app/modals/view-event/view-event.page';
 import { WsChatMethodsService } from 'src/app/services/chat/ws-chat-methods.service'
 import { MessageService } from 'src/app/services/chat/message.service';
+import { AttachmentsService } from 'src/app/services/attachments.service';
+
+import { CameraService } from 'src/app/services/camera.service';
+import { element } from 'protractor';
+import { FileType } from 'src/app/models/fileType';
+import { SearchPage } from 'src/app/pages/search/search.page';
+import { Storage } from '@ionic/storage';
+import { FileToBase64Service } from 'src/app/services/file/file-to-base64.service';
 
 const IMAGE_DIR = 'stored-images';
 
@@ -98,7 +105,13 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     private changeDetectorRef: ChangeDetectorRef,
     private platform: Platform,
     private sqlservice: SqliteService,
-    public wsChatMethodsService: WsChatMethodsService
+    public wsChatMethodsService: WsChatMethodsService,
+    private AttachmentsService: AttachmentsService,
+    
+    private CameraService: CameraService,
+    private processesService: ProcessesService,
+    private storage: Storage,
+    private fileToBase64Service: FileToBase64Service,
   ) {
     this.loggedUser = authService.ValidatedUserChat['data'];
     this.roomId = this.navParams.get('roomId');
@@ -121,11 +134,13 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
   }
 
   ngOnInit() {
-    //this.load();
-    this.setStatus('online');
+    this.wsChatMethodsService.getUserOfRoom(this.roomId).then((value) => {
+      console.log('MEMBER', value)
+    })
 
     //this.loadFiles();
     VoiceRecorder.requestAudioRecordingPermission();
+    this.getChatMembers();
     Filesystem.mkdir({
       path: IMAGE_DIR,
       directory: Directory.Data,
@@ -253,15 +268,6 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     this.selectedMsgId = "";
   }
 
-  setStatus(status: string) {
-    let body = {
-      message: '',
-      status: status,
-    }
-    this.chatService.setUserStatus(body).subscribe(res => {
-      console.log(res);
-    })
-  }
 
   notImplemented() {
     this.alertService.presentAlert('Funcionalidade em desenvolvimento');
@@ -272,7 +278,6 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
   }
 
   load() {
-    this.serverLongPull();
     this.getChatMembers();
   }
 
@@ -347,7 +352,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
   }
   
   sendMessage() {
-    this.wsChatMethodsService.getDmRoom(this.roomId).send()
+    this.wsChatMethodsService.getDmRoom(this.roomId).send({})
   }
 
 
@@ -515,9 +520,122 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
     }
   }
 
+
+  async takePicture() {
+    const roomId = this.roomId
+    
+    const image = await this.CameraService.takePicture();
+    await this.fileService.saveImage(image)
+    const lastphoto: any = await this.fileService.loadFiles();
+    const { capturedImage, capturedImageTitle} = await this.fileService.loadFileData(lastphoto);
+
+    
+    const base64 = await fetch(capturedImage);
+    const blob = await base64.blob();
+    const formData = new FormData();
+    formData.append("blobFile", blob);
+    console.log('ALL IMAGE', formData)
+
+    this.wsChatMethodsService.getDmRoom(roomId).send({
+      file: {
+        "type": "application/img",
+        "guid": '',
+        "image_url": capturedImage
+      },
+      attachments: [{
+        "image_url": capturedImage,
+        "title": capturedImageTitle ,
+        "text": "description",
+        "title_link_download": false,
+      }],
+      temporaryData: formData
+    })
+
+  }
+  
+  async addImage() {
+    this.addFileToChat(['image/apng', 'image/jpeg', 'image/png'])
+  }
+  
+  async addFile() {
+    this.addFileToChat(['.doc', '.docx', '.pdf'])
+  }
+
+  async addFileWebtrix() {
+    const modal = await this.modalController.create({
+      component: SearchPage,
+      cssClass: 'group-messages modal-desktop search-modal search-modal-to-desktop',
+      componentProps: {
+        type: 'AccoesPresidenciais & ArquivoDespachoElect',
+        select: true,
+        showSearchInput: true,
+      }
+    });
+    await modal.present();
+    modal.onDidDismiss().then(async res=>{
+      const data = res.data;
+      const roomId = this.roomId
+
+      if(data.selected) {
+        const loader = this.toastService.loading();
+
+        this.wsChatMethodsService.getDmRoom(roomId).send({
+          file:{
+            "name": res.data.selected.Assunto,
+            "type": "application/webtrix",
+            "ApplicationId": res.data.selected.ApplicationType,
+            "DocId": res.data.selected.Id,
+            "Assunto": res.data.selected.Assunto,
+          },
+          attachments: [{
+            "title": res.data.selected.Assunto,
+            "description": res.data.selected.DocTypeDesc,
+            // "title_link": url_no_options,
+            "title_link_download": true,
+            "thumb_url": "https://static.ichimura.ed.jp/uploads/2017/10/pdf-icon.png",
+            // "message_link": url_no_options,
+            "text": res.data.selected.DocTypeDesc,
+            "type": "webtrix"
+          }],
+        })
+
+        loader.remove();
+
+      }
+    });
+  }
+
+
+
+  async addFileToChat(types: typeof FileType[] ) {
+    const roomId = this.roomId
+
+    const file: any = await this.fileService.getFileFromDevice(types);
+    const imageData =  await this.fileToBase64Service.convert(file)
+
+    const formData = new FormData();
+    formData.append("blobFile", file);
+    
+    this.wsChatMethodsService.getDmRoom(roomId).send({
+      file: {
+        "type": "application/img",
+        "guid": '',
+        "image_url": imageData
+      },
+      temporaryData: formData,
+      attachments: [{
+        "title": file.name ,
+        "image_url": imageData,
+        "text": "description",
+        "title_link_download": false,
+      }]
+    })
+
+  }
+
   async openChatOptions(ev?: any) {
     const roomId = this.roomId
-    console.log(this.members);
+    console.log('MOBILE CHAT OPTION',this.members);
 
     const popover = await this.popoverController.create({
       component: ChatOptionsPopoverPage,
@@ -531,66 +649,29 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
       translucent: true
     });
     await popover.present();
-    popover.onDidDismiss().then((res) => {
+    popover.onDidDismiss().then( async (res) => {
       console.log(res['data']);
       if (res['data'] == 'meeting') {
         this.bookMeeting();
       }
       else if (res['data'] == 'take-picture') {
-        this.fileService.addCameraPictureToChat(roomId);
-        //this.loadPicture();
+        this.takePicture()
       }
       else if (res['data'] == 'add-picture') {
-        this.fileService.addPictureToChatMobile(roomId);
-        //this.loadPicture();
+        this.addImage()
       }
       else if (res['data'] == 'add-document') {
-        this.fileService.addDocumentToChat(this.roomId);
-        //this.loadDocument();
+        this.addFile()
       }
       else if (res['data'] == 'documentoGestaoDocumental') {
 
-        this.fileService.addDocGestaoDocumentalToChat(this.roomId);
-        //this.addDocGestaoDocumental();
+        this.addFileWebtrix()
       }
 
 
     });
   }
 
-  /*
-        this.fileService.downloadFile(element.file.guid).subscribe(async (event) => {
-          var name = element.file.guid;
-          if (event.type === HttpEventType.DownloadProgress) {
-
-          } else if (event.type === HttpEventType.Response) {
-            var base64 = btoa(new Uint8Array(event.body).reduce((data, byte) => data + String.fromCharCode(byte), '')
-            );
-
-            console.log('TRY ARRAY BUFFER NAME', name);
-            console.log('TRY ARRAY BUFFER', base64);
-
-            await Filesystem.writeFile({
-              path: `${IMAGE_DIR}/${name}`,
-              data: base64,
-              directory: Directory.Data
-            }).then((foo) => {
-
-              console.log('LSKE FS FILE SAVED', foo)
-
-            }).catch((error) => {
-              console.log('error LAKE FS FILE', error)
-            });
-
-
-
-          const readFile = await Filesystem.readFile({
-            path: `${IMAGE_DIR}/${name}`,
-            directory: Directory.Data,
-          });
-
-
-        });*/
 
   getRoomMessageDB(roomId) {
     if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
@@ -666,108 +747,12 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
 
   }
 
-  async serverLongPull() {
-
-    const roomId = this.roomId
-
-    /* this.chatService.getRoomMessages(roomId).subscribe(res=>{
-      console.log(res);
-
-    }) */
-
-
-    this.chatService.getRoomMessages(roomId).subscribe(async res => {
-      console.log("Chat message", res)
-
-      this.transformDataMSG(res['messages'])
-      this.getRoomMessageDB(this.roomId);
-
-
-      if (res == 502) {
-        // Connection timeout
-        // happens when the synchro was pending for too long
-        // let's reconnect
-        await this.serverLongPull();
-      }
-      else if (res != 200) {
-        // Show Error
-        //showMessage(response.statusText);
-        //this.loadMessages()
-        if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
-
-        }
-
-
-        //console.log(this.messages);
-        // Reconnect in one second
-        if (this.route.url != "/home/chat") {
-          console.log("Timer message stop")
-        } else {
-          //Check if modal is opened
-          if (document.querySelector('.isMessagesChatOpened')) {
-            await new Promise(resolve => setTimeout(resolve, 5000));
-            await this.serverLongPull();
-            //console.log('Timer message running')
-          }
-        }
-
-      } else {
-        // Got message
-        //let message = await response.text();
-        //this.loadMessages()
-        await this.serverLongPull();
-      }
-    });
-  }
-
-
-  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;
-  }
 
   downloadFileMsg(msg: MessageService) {
     console.log('FILE TYPE', msg.file.type)
     this.downloadFile = "";
     if (msg.file.type == "application/img") {
-      this.fileService.downloadFile(msg.file.guid).subscribe(async (event) => {
+      this.AttachmentsService.downloadFile(msg.file.guid).subscribe(async (event) => {
         console.log('FILE TYPE 22', msg.file.guid)
         var name = msg.file.guid;
 

src/app/pages/events/events.page.ts

@@ -21,6 +21,7 @@ import { NetworkConnectionService } from 'src/app/services/network-connection.se
 import { BackgroundService } from 'src/app/services/background.service';
 import { momentG } from 'src/plugin/momentG';
 import { ThemeService } from 'src/app/services/theme.service'
+import { Storage } from '@ionic/storage';
 @Component({
   selector: 'app-events',
   templateUrl: './events.page.html',
@@ -95,7 +96,8 @@ export class EventsPage implements OnInit {
     private sqliteservice: SqliteService,
     private networkconnection: NetworkConnectionService,
     private backgroundservice: BackgroundService,
-    public ThemeService: ThemeService
+    public ThemeService: ThemeService,
+    private storage: Storage
   ) {
   /*   this.existingScreenOrientation = this.screenOrientation.type;
     console.log(this.existingScreenOrientation); */
@@ -317,6 +319,9 @@ export class EventsPage implements OnInit {
   addEventToDb(list) {
 
     if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
+      this.storage.set('events', list).then(() => {
+        console.log('Init events saved')
+      })
     } else {
       if (list.length > 0) {
         list.forEach(element => {
@@ -359,6 +364,9 @@ export class EventsPage implements OnInit {
   addProcessToDb(list) {
 
     if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
+      this.storage.set('process', list).then(() => {
+        console.log('Init process saved')
+      })
     } else {
       if (list.length > 0) {
         list.forEach(element => {
@@ -376,6 +384,23 @@ export class EventsPage implements OnInit {
     let dateToday = date.getFullYear() + "-" + month + "-" + date.getDate();
     console.log('dateeeeee', dateToday)
     if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
+      this.storage.get('events').then((events: any[]) => {
+        console.log('Today events',events)
+        let todayEvents = new Array()
+        this.listToPresent = events
+        this.totalEvent = this.listToPresent.length
+        this.currentEvent = this.listToPresent[0].Subject
+        this.currentHoursMinutes = this.listToPresent[0].StartDate
+        console.log("All events from local,", events)
+      })
+
+      this.storage.get('process').then((process: any[]) => {
+        console.log('OFOFOFOOF22222', process)
+          const ExpedienteTask = process.map(e => this.expedienteTaskPipe.transform(e))
+          this.listToPresentexpediente = ExpedienteTask;
+      })
+
+      this.showLoader = false;
 
     } else {
       this.sqliteservice.getAllEvents().then((event: any[]) => {

src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts

@@ -19,6 +19,7 @@ import { Platform } from '@ionic/angular';
 import { ThemeService } from 'src/app/services/theme.service'
 import { OfflineManagerService } from 'src/app/services/offline-manager.service';
 import { RouteService } from 'src/app/services/route.service';
+import { Storage } from '@ionic/storage';
 
 @Component({
   selector: 'app-approve-event',
@@ -63,7 +64,8 @@ export class ApproveEventPage implements OnInit {
     private platform: Platform,
     private backgroundservice: BackgroundService,
     public ThemeService: ThemeService,
-    private offlineManager: OfflineManagerService
+    private offlineManager: OfflineManagerService,
+    private storage: Storage
   ) {
     this.activatedRoute.paramMap.subscribe(params => {
       // console.log(params["params"]);
@@ -110,6 +112,9 @@ export class ApproveEventPage implements OnInit {
 
   addProcessToDB(data) {
     if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
+      this.storage.set('approve_event_detils', data).then(() => {
+        console.log('APPROVE EVENT DETAILS SAVED')
+      })
     } else {
       this.sqliteservice.updateProcess(data);
     }
@@ -117,69 +122,85 @@ export class ApproveEventPage implements OnInit {
 
   getProcessFromDB() {
 
-    this.platform.ready().then(() => {
-
-      this.sqliteservice.getProcessById(this.serialNumber).then((process) => {
-        console.log('event aprove serial', process)
-
-        var doc;
-        var action = [];
-        var origi = [];
-        var wordafi = {};
-        if (process[0].Documents === "null" || process[0].Documents === "undefined") {
-          doc = []
-        } else {
-          doc = JSON.parse(process[0].Documents)
-        }
-
-        if (process[0].actions === "null" || process[0].actions === "undefined") {
-          action = []
-        } else {
-          action = JSON.parse(process[0].Documents)
-        }
-
-        if (process[0].originator === "null" || process[0].originator === "undefined") {
-          origi = []
-        } else {
-          origi = JSON.parse(process[0].Documents)
-        }
-        if (process[0].workflowInstanceDataFields === "null" || process[0].workflowInstanceDataFields === "undefined") {
-          wordafi = []
-        } else {
-          wordafi = JSON.parse(process[0].workflowInstanceDataFields)
-        }
-
-        let task = {
-          "Documents": doc,
-          "actions": action,
-          "activityInstanceName": process[0].activityInstanceName,
-          "formURL": process[0].formURL,
-          "originator": origi,
-          "serialNumber": process[0].serialNumber,
-          "taskStartDate": process[0].taskStartDate,
-          "totalDocuments": process[0].totalDocuments,
-          "workflowDisplayName": process[0].workflowDisplayName,
-          "workflowID": process[0].workflowID,
-          "workflowInstanceDataFields": wordafi,
-          "workflowInstanceFolio": process[0].workflowInstanceFolio,
-          "workflowInstanceID": process[0].workflowInstanceID,
-          "workflowName": process[0].workflowInstanceID
-
-        }
-
-        this.loadedEvent = task
-        console.log('offline event', this.loadedEvent);
-
-        this.today = new Date(this.loadedEvent.workflowInstanceDataFields.StartDate);
-
-        this.customDate = this.days[this.today.getDay()] + ", " + this.today.getDate() + " de " + (this.months[this.today.getMonth()]);
-
-        let instanceId = this.loadedEvent.workflowInstanceDataFields.InstanceId;
-        this.loadedAttachments = this.loadedEvent.Documents;
-        console.log('Attatara', this.loadedAttachments)
-
+    if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
+      this.storage.get('approve_event_detils').then((event) => {
+        this.loadedEvent = event
+          console.log('offline event', this.loadedEvent);
+  
+          this.today = new Date(this.loadedEvent.workflowInstanceDataFields.StartDate);
+  
+          this.customDate = this.days[this.today.getDay()] + ", " + this.today.getDate() + " de " + (this.months[this.today.getMonth()]);
+  
+          let instanceId = this.loadedEvent.workflowInstanceDataFields.InstanceId;
+          this.loadedAttachments = this.loadedEvent.Documents;
+          console.log('Attatara', this.loadedAttachments)
       })
-    })
+    } else {
+      this.platform.ready().then(() => {
+
+        this.sqliteservice.getProcessById(this.serialNumber).then((process) => {
+          console.log('event aprove serial', process)
+  
+          var doc;
+          var action = [];
+          var origi = [];
+          var wordafi = {};
+          if (process[0].Documents === "null" || process[0].Documents === "undefined") {
+            doc = []
+          } else {
+            doc = JSON.parse(process[0].Documents)
+          }
+  
+          if (process[0].actions === "null" || process[0].actions === "undefined") {
+            action = []
+          } else {
+            action = JSON.parse(process[0].Documents)
+          }
+  
+          if (process[0].originator === "null" || process[0].originator === "undefined") {
+            origi = []
+          } else {
+            origi = JSON.parse(process[0].Documents)
+          }
+          if (process[0].workflowInstanceDataFields === "null" || process[0].workflowInstanceDataFields === "undefined") {
+            wordafi = []
+          } else {
+            wordafi = JSON.parse(process[0].workflowInstanceDataFields)
+          }
+  
+          let task = {
+            "Documents": doc,
+            "actions": action,
+            "activityInstanceName": process[0].activityInstanceName,
+            "formURL": process[0].formURL,
+            "originator": origi,
+            "serialNumber": process[0].serialNumber,
+            "taskStartDate": process[0].taskStartDate,
+            "totalDocuments": process[0].totalDocuments,
+            "workflowDisplayName": process[0].workflowDisplayName,
+            "workflowID": process[0].workflowID,
+            "workflowInstanceDataFields": wordafi,
+            "workflowInstanceFolio": process[0].workflowInstanceFolio,
+            "workflowInstanceID": process[0].workflowInstanceID,
+            "workflowName": process[0].workflowInstanceID
+  
+          }
+  
+          this.loadedEvent = task
+          console.log('offline event', this.loadedEvent);
+  
+          this.today = new Date(this.loadedEvent.workflowInstanceDataFields.StartDate);
+  
+          this.customDate = this.days[this.today.getDay()] + ", " + this.today.getDate() + " de " + (this.months[this.today.getMonth()]);
+  
+          let instanceId = this.loadedEvent.workflowInstanceDataFields.InstanceId;
+          this.loadedAttachments = this.loadedEvent.Documents;
+          console.log('Attatara', this.loadedAttachments)
+  
+        })
+      })
+    }
+
     console.log('Offlineee')
   }
 

src/app/pages/gabinete-digital/event-list/event-list.page.ts

@@ -14,6 +14,7 @@ import { Platform } from '@ionic/angular';
 import { SortService } from 'src/app/services/functions/sort.service';
 import { ThemeService } from 'src/app/services/theme.service'
 import { RouteService } from 'src/app/services/route.service';
+import { Storage } from '@ionic/storage';
 
 @Component({
   selector: 'app-event-list',
@@ -46,7 +47,8 @@ export class EventListPage implements OnInit {
     private sortService: SortService,
     private backgroundservice: BackgroundService,
     public ThemeService: ThemeService,
-    private RouteService: RouteService
+    private RouteService: RouteService,
+    private storage: Storage
   ) { }
 
   ngOnInit() {
@@ -83,22 +85,37 @@ export class EventListPage implements OnInit {
 
   getEventToAproveFromDB() {
 
-    this.platform.ready().then(() => {
+    
 
-      this.sqliteservice.getListOfEventAprove('Agenda Oficial MDGPR', 'Agenda Pessoal MDGPR').then((event: any[]) => {
-
-        this.eventsMDGPRList = this.sortService.sortDate(this.transformaDataDB(event), 'taskStartDate')
-        //this.eventsMDGPRList = this.eventsMDGPRList.filter(element => element.interveners != null)
-        console.log('MD event to aprove', this.eventsMDGPRList)
+    if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
+      this.storage.get('event-to-aproveMD').then((events) => {
+        this.eventsMDGPRList = events
+      })
+  
+      this.storage.get('event-to-aprovePR').then((events) => {
+        this.eventsPRList = events
+      })
+    } else {
+      this.platform.ready().then(() => {
 
+        this.sqliteservice.getListOfEventAprove('Agenda Oficial MDGPR', 'Agenda Pessoal MDGPR').then((event: any[]) => {
+  
+          this.eventsMDGPRList = this.sortService.sortDate(this.transformaDataDB(event), 'taskStartDate')
+          //this.eventsMDGPRList = this.eventsMDGPRList.filter(element => element.interveners != null)
+          console.log('MD event to aprove', this.eventsMDGPRList)
+  
+        })
+  
+        this.sqliteservice.getListOfEventAprove('Agenda Oficial PR', 'Agenda Pessoal PR').then((event: any[]) => {
+          this.eventsPRList = this.sortService.sortDate(this.transformaDataDB(event), 'taskStartDate')
+          console.log('PR event to aprove', this.eventsPRList)
+  
+        })
       })
 
-      this.sqliteservice.getListOfEventAprove('Agenda Oficial PR', 'Agenda Pessoal PR').then((event: any[]) => {
-        this.eventsPRList = this.sortService.sortDate(this.transformaDataDB(event), 'taskStartDate')
-        console.log('PR event to aprove', this.eventsPRList)
+    }
+
 
-      })
-    })
     console.log('Offlineee')
   }
 
@@ -143,16 +160,24 @@ export class EventListPage implements OnInit {
         let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
         this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);
         this.eventsMDGPRList = this.sortService.sortDate(this.eventsMDGPRList, 'taskStartDate')
+        this.eventsMDGPRList = this.sortService.sortArrayByDate(this.eventsMDGPRList)
         console.log('MD EVENT TO APROVE ONLINE',this.eventsMDGPRList)
-        this.eventaprovacaostore.resetmd(this.sortService.sortArrayByDate(this.eventsMDGPRList).reverse());
+        this.storage.set('event-to-aproveMD',this.eventsMDGPRList).then(() => {
+          console.log(' EVENTMD TO APROVE SAVED')
+        })
+        //this.eventaprovacaostore.resetmd(this.sortService.sortArrayByDate(this.eventsMDGPRList).reverse());
       }
       else if (this.segment == 'PR') {
         let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise();
         let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise();
         this.eventsPRList = prEventsOficial.concat(prEventsPessoal);
         this.eventsPRList = this.sortService.sortDate(this.eventsPRList, 'taskStartDate')
+        this.eventsPRList = this.sortService.sortArrayByDate(this.eventsPRList)
         console.log('PR EVENT TO APROVE ONLINE',this.eventsPRList)
-        this.eventaprovacaostore.resetpr(this.sortService.sortArrayByDate(this.eventsPRList).reverse());
+        this.storage.set('event-to-aprovePR',this.eventsPRList).then(() => {
+          console.log(' EVENTPR TO APROVE SAVED')
+        })
+        //this.eventaprovacaostore.resetpr(this.sortService.sortArrayByDate(this.eventsPRList).reverse());
       }
       this.showLoader = false;
       this.skeletonLoader = false
@@ -162,6 +187,8 @@ export class EventListPage implements OnInit {
     })
   }
 
+
+
   async openApproveModal(eventSerialNumber, event) {
     const modal = await this.modalController.create({
       component: ApproveEventModalPage,

src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts

@@ -33,6 +33,7 @@ import { BackgroundService } from 'src/app/services/background.service';
 import { NewGroupPage } from 'src/app/pages/chat/new-group/new-group.page';
 import { DataService } from 'src/app/services/data.service';
 import { RouteService } from 'src/app/services/route.service';
+import { Storage } from '@ionic/storage';
 
 @Component({
   selector: 'app-expediente-detail',
@@ -82,6 +83,7 @@ export class ExpedienteDetailPage implements OnInit {
     private backgroundservice: BackgroundService,
     public ThemeService: ThemeService,
     private dataService: DataService,
+    private storage: Storage
   ) {
     this.activatedRoute.paramMap.subscribe(params => {
       if (params["params"].SerialNumber) {
@@ -112,63 +114,106 @@ export class ExpedienteDetailPage implements OnInit {
 
   updateProcessDB(res) {
     if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
+      this.storage.set('expediente_details',res).then(() =>{
+        console.log('EXPEDIENTE DETAILS SAVED')
+      })
     } else {
       this.sqliteservice.updateProcess(res)
     }
   }
   getFromDB() {
-
-    this.platform.ready().then(() => {
-      this.onlinecheck = false;
-      this.sqliteservice.getProcessById(this.serialNumber).then((process) => {
-        console.log("expedient ditail", process)
-
-        var workflow = JSON.parse(process[0].workflowInstanceDataFields);
-        var origina
-        if (process[0].originator === "undefined") {
-          origina = ""
-        } else {
-          origina = JSON.parse(process[0].originator)
-        }
-
+    if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
+      this.storage.get('expediente_details').then((process) => {
         this.task = {
-          "SerialNumber": process[0].serialNumber,
-          "Folio": workflow.Subject,
-          "Senders": origina.email || process[0].originator,
-          "CreateDate": momentG(new Date(process[0].taskStartDate), 'yyyy-MM-dd HH:mm:ss'),
-          "DocumentURL": workflow.ViewerRequest,
-          "Remetente": workflow.Sender,
-          "Note": workflow.TaskMessage || workflow.Note,
-          "FolderId": workflow.FolderID,
-          "FsId": workflow.FsId,
-          "DocId": workflow.DocID,
-          "WorkflowName": process[0].workflowDisplayName,
-          "Status": workflow.Status,
-          "DispatchNumber": workflow.DispatchNumber,
-          "AttachmentsProcessLastInstanceID": workflow.AttachmentsProcessLastInstanceID,
-          "InstanceID": workflow.InstanceID
+          "SerialNumber": process.serialNumber,
+          "Folio": process.workflowInstanceDataFields.Subject,
+          "Senders": process.originator || process.originator,
+          "CreateDate": momentG(new Date(process.taskStartDate), 'yyyy-MM-dd HH:mm:ss'),
+          "DocumentURL": process.workflowInstanceDataFields.ViewerRequest,
+          "Remetente": process.workflowInstanceDataFields.Sender,
+          "Note": process.workflowInstanceDataFields.TaskMessage || process.workflowInstanceDataFields.Note,
+          "FolderId": process.workflowInstanceDataFields.FolderID,
+          "FsId": process.workflowInstanceDataFields.FsId,
+          "DocId": process.workflowInstanceDataFields.DocID,
+          "WorkflowName": process.workflowDisplayName,
+          "Status": process.workflowInstanceDataFields.Status,
+          "DispatchNumber": process.workflowInstanceDataFields.DispatchNumber,
+          "AttachmentsProcessLastInstanceID": process.workflowInstanceDataFields.AttachmentsProcessLastInstanceID,
+          "InstanceID": process.workflowInstanceDataFields.InstanceID
         }
 
         this.fulltask = {
-          Documents: JSON.parse(process[0].Documents),
-          actions: JSON.parse(process[0].actions),
-          activityInstanceName: process[0].activityInstanceName,
-          formURL: process[0].formURL,
-          interveners: process[0].interveners,
-          originator: JSON.parse(process[0].originator),
-          serialNumber: process[0].serialNumber,
-          taskStartDate: process[0].taskStartDate,
-          totalDocuments: process[0].totalDocuments,
-          workflowDisplayName: process[0].workflowDisplayName,
-          workflowID: process[0].workflowID,
-          workflowInstanceDataFields: JSON.parse(process[0].workflowInstanceDataFields),
-          workflowInstanceFolio: process[0].workflowInstanceFolio,
-          workflowInstanceID: process[0].workflowInstanceID,
-          workflowName: process[0].workflowName,
+          Documents: process.Documents,
+          actions: process.actions,
+          activityInstanceName: process.activityInstanceName,
+          formURL: process.formURL,
+          interveners: process.interveners,
+          originator: process.originator,
+          serialNumber: process.serialNumber,
+          taskStartDate: process.taskStartDate,
+          totalDocuments: process.totalDocuments,
+          workflowDisplayName: process.workflowDisplayName,
+          workflowID: process.workflowID,
+          workflowInstanceDataFields: process.workflowInstanceDataFields,
+          workflowInstanceFolio: process.workflowInstanceFolio,
+          workflowInstanceID: process.workflowInstanceID,
+          workflowName: process.workflowName,
         }
-
       })
-    })
+    } else {
+      this.platform.ready().then(() => {
+        this.onlinecheck = false;
+        this.sqliteservice.getProcessById(this.serialNumber).then((process) => {
+          console.log("expedient ditail", process)
+  
+          var workflow = JSON.parse(process[0].workflowInstanceDataFields);
+          var origina
+          if (process[0].originator === "undefined") {
+            origina = ""
+          } else {
+            origina = JSON.parse(process[0].originator)
+          }
+  
+          this.task = {
+            "SerialNumber": process[0].serialNumber,
+            "Folio": workflow.Subject,
+            "Senders": origina.email || process[0].originator,
+            "CreateDate": momentG(new Date(process[0].taskStartDate), 'yyyy-MM-dd HH:mm:ss'),
+            "DocumentURL": workflow.ViewerRequest,
+            "Remetente": workflow.Sender,
+            "Note": workflow.TaskMessage || workflow.Note,
+            "FolderId": workflow.FolderID,
+            "FsId": workflow.FsId,
+            "DocId": workflow.DocID,
+            "WorkflowName": process[0].workflowDisplayName,
+            "Status": workflow.Status,
+            "DispatchNumber": workflow.DispatchNumber,
+            "AttachmentsProcessLastInstanceID": workflow.AttachmentsProcessLastInstanceID,
+            "InstanceID": workflow.InstanceID
+          }
+  
+          this.fulltask = {
+            Documents: JSON.parse(process[0].Documents),
+            actions: JSON.parse(process[0].actions),
+            activityInstanceName: process[0].activityInstanceName,
+            formURL: process[0].formURL,
+            interveners: process[0].interveners,
+            originator: JSON.parse(process[0].originator),
+            serialNumber: process[0].serialNumber,
+            taskStartDate: process[0].taskStartDate,
+            totalDocuments: process[0].totalDocuments,
+            workflowDisplayName: process[0].workflowDisplayName,
+            workflowID: process[0].workflowID,
+            workflowInstanceDataFields: JSON.parse(process[0].workflowInstanceDataFields),
+            workflowInstanceFolio: process[0].workflowInstanceFolio,
+            workflowInstanceID: process[0].workflowInstanceID,
+            workflowName: process[0].workflowName,
+          }
+  
+        })
+      })
+    }
+    
   }
 
 

src/app/pages/gabinete-digital/expediente/expediente.page.ts

@@ -9,6 +9,7 @@ import { Platform } from '@ionic/angular';
 import { BackgroundService } from '../../../services/background.service';
 import { ThemeService } from 'src/app/services/theme.service'
 import { SortService } from 'src/app/services/functions/sort.service';
+import {Storage } from '@ionic/storage';
 
 @Component({
   selector: 'app-expediente',
@@ -40,6 +41,7 @@ export class ExpedientePage implements OnInit {
     private backgroundservice: BackgroundService,
     public ThemeService: ThemeService,
     private sortService: SortService,
+    private storage: Storage
   ) { }
 
   ngOnInit() {
@@ -112,63 +114,48 @@ export class ExpedientePage implements OnInit {
 
   addProcessTODb(task) {
     if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
+      this.storage.set('gabinete-expediente',task).then(() => {
+        console.log('GABINETE EXPEDIENTE SAVED')
+      })
     } else {
       this.sqliteservice.addProcess(task);
     }
   }
 
-  SqliteAddExpediente(list) {
-    list.forEach((expediente) => {
-      let data = {
-        serialNumber: expediente.serialNumber,
-        workflowInstanceFolio: expediente.workflowInstanceFolio,
-        Documents: expediente.Documents,
-        actions: expediente.actions,
-        activityInstanceName: expediente.activityInstanceName,
-        formURL: expediente.formURL,
-        originator: expediente.originator,
-        taskStartDate: expediente.taskStartDate,
-        totalDocuments: expediente.totalDocuments,
-        workflowDisplayName: expediente.workflowDisplayName,
-        workflowID: expediente.workflowID,
-        workflowInstanceDataFields: expediente.workflowInstanceDataFields,
-        workflowInstanceID: expediente.workflowInstanceID,
-        workflowName: expediente.workflowName
-      }
-
-      this.sqliteservice.addExpediente(data);
-    })
-
-  }
-
   getEventsFromLocalDb() {
 
-    this.taskslist = new Array();
-    this.sqliteservice.getprocessByworkflow("Expediente").then((expediente: any[]) => {
-      console.log("All expedientes from local,", expediente)
-
-      expediente.forEach((element) => {
-
-        var workflow = JSON.parse(element.workflowInstanceDataFields);
-
-        let exped = {
-          "CreateDate": element.taskStartDate,
-          "DocumentsQty": element.totalDocuments,
-          "Senders": workflow.Senders,
-          "SerialNumber": element.serialNumber,
-          "Status": workflow.Status,
-          "Subject": workflow.Subject,
-          "WorkflowName": element.workflowDisplayName,
-          "activityInstanceName": element.activityInstanceName
-        }
-
-        this.taskslist.push(exped)
-
-      });
-
-      this.listToPresent = this.taskslist
-
-    })
+    if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
+      this.storage.get('gabinete-expediente').then((expediente) => {
+        this.listToPresent = expediente
+      })
+    } else {
+      this.taskslist = new Array();
+      this.sqliteservice.getprocessByworkflow("Expediente").then((expediente: any[]) => {
+        console.log("All expedientes from local,", expediente)
+  
+        expediente.forEach((element) => {
+  
+          var workflow = JSON.parse(element.workflowInstanceDataFields);
+  
+          let exped = {
+            "CreateDate": element.taskStartDate,
+            "DocumentsQty": element.totalDocuments,
+            "Senders": workflow.Senders,
+            "SerialNumber": element.serialNumber,
+            "Status": workflow.Status,
+            "Subject": workflow.Subject,
+            "WorkflowName": element.workflowDisplayName,
+            "activityInstanceName": element.activityInstanceName
+          }
+  
+          this.taskslist.push(exped)
+  
+        });
+  
+        this.listToPresent = this.taskslist
+  
+      })
+    }
   }
 
 }

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

@@ -31,6 +31,7 @@ import { Platform } from '@ionic/angular';
 import { BackgroundService } from 'src/app/services/background.service';
 import { SortService } from 'src/app/services/functions/sort.service';
 import { DataService } from 'src/app/services/data.service';
+import { Storage } from '@ionic/storage';
 
 @Component({
   selector: 'app-gabinete-digital',
@@ -135,6 +136,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
     public ThemeService: ThemeService,
     private sortService: SortService,
     private dataService: DataService,
+    private storage: Storage
   ) {
 
     this.loggeduser = authService.ValidatedUser;
@@ -215,7 +217,9 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
   addProcessToDB(data) {
     this.platform.ready().then(() => {
       if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
-
+        this.storage.set('GabineteProcess', data).then(() => {
+          console.log('Gabinete process saved')
+        })
       } else {
         data.forEach(element => {
 
@@ -245,39 +249,77 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
   getAllProcessFromDB() {
 
     this.hideRefreshButton();
+    if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
+      this.storage.get('GabineteProcess').then((allprocess: any[]) => {
+        console.log('ALL PROCESS WEB',allprocess )
+        allprocess.forEach(element => {
+          let date = new Date(element.taskStartDate);
+          date.setMonth(date.getMonth() + 1);
+          let taskDate = date.getFullYear() + "-" + date.getMonth() + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
+    
+          let task = {
+            "SerialNumber": element.serialNumber,
+            "Folio": element.workflowInstanceDataFields.Subject,
+            "Senders": element.workflowInstanceDataFields.Sender,
+            //"CreateDate": taskDate,
+            "CreateDate": new Date(element.taskStartDate),
+            "DocumentURL": element.workflowInstanceDataFields.ViewerRequest,
+            "Remetente": element.workflowInstanceDataFields.Remetente,
+            "DocumentsQty": element.totalDocuments,
+            "DocId": element.workflowInstanceDataFields.DispatchDocId,
+            "FolderID": element.workflowInstanceDataFields.FolderID,
+            "WorkflowName": element.workflowDisplayName,
+            "activityInstanceName": element.activityInstanceName,
+            "Status": element.workflowInstanceDataFields.Status,
+            "Agenda": element.workflowInstanceDataFields.Agenda,
+            "customDate": this.setFormatDate(new Date(element.workflowInstanceDataFields.StartDate), new Date(element.workflowInstanceDataFields.EndDate), element.workflowInstanceDataFields.IsAllDayEvent),
+          }
+    
+          this.allProcessesList.push(task);
+          this.allProcessesList = removeDuplicate(this.allProcessesList);
+          this.allProcessesList = this.sortService.sortDate(this.allProcessesList, 'CreateDate')
+    
+        });
+      })
+    } else {
+      this.sqliteservice.getAllProcess().then((allprocess: any[]) => {
+        allprocess.forEach(element => {
+          let date = new Date(element.taskStartDate);
+          date.setMonth(date.getMonth() + 1);
+          let taskDate = date.getFullYear() + "-" + date.getMonth() + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
+  
+          var workflowInstanceDataFields = JSON.parse(element.workflowInstanceDataFields);
+  
+          let task = {
+            "SerialNumber": element.serialNumber,
+            "Folio": workflowInstanceDataFields.Subject,
+            "Senders": workflowInstanceDataFields.Sender,
+            "CreateDate": taskDate,
+            "DocumentURL": workflowInstanceDataFields.ViewerRequest,
+            "Remetente": workflowInstanceDataFields.Remetente,
+            "DocumentsQty": element.totalDocuments,
+            "DocId": workflowInstanceDataFields.DispatchDocId,
+            "FolderID": workflowInstanceDataFields.FolderID,
+            "WorkflowName": element.workflowDisplayName,
+            "activityInstanceName": element.activityInstanceName,
+            "Status": workflowInstanceDataFields.Status,
+            "Agenda": workflowInstanceDataFields.Agenda,
+            "customDate": this.setFormatDate(new Date(workflowInstanceDataFields.StartDate), new Date(workflowInstanceDataFields.EndDate), workflowInstanceDataFields.IsAllDayEvent),
+          }
+  
+          this.allProcessesList.push(task);
+          this.allProcessesList = removeDuplicate(this.allProcessesList)
+          this.allProcessesList = this.sortService.sortDate(this.allProcessesList, 'CreateDate')
+  
+        });
+        console.log("All process from db ", allprocess)
+      })
+    }
 
-    this.sqliteservice.getAllProcess().then((allprocess: any[]) => {
-      allprocess.forEach(element => {
-        let date = new Date(element.taskStartDate);
-        date.setMonth(date.getMonth() + 1);
-        let taskDate = date.getFullYear() + "-" + date.getMonth() + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
+  }
 
-        var workflowInstanceDataFields = JSON.parse(element.workflowInstanceDataFields);
+  dataTranform(data) {
 
-        let task = {
-          "SerialNumber": element.serialNumber,
-          "Folio": workflowInstanceDataFields.Subject,
-          "Senders": workflowInstanceDataFields.Sender,
-          "CreateDate": taskDate,
-          "DocumentURL": workflowInstanceDataFields.ViewerRequest,
-          "Remetente": workflowInstanceDataFields.Remetente,
-          "DocumentsQty": element.totalDocuments,
-          "DocId": workflowInstanceDataFields.DispatchDocId,
-          "FolderID": workflowInstanceDataFields.FolderID,
-          "WorkflowName": element.workflowDisplayName,
-          "activityInstanceName": element.activityInstanceName,
-          "Status": workflowInstanceDataFields.Status,
-          "Agenda": workflowInstanceDataFields.Agenda,
-          "customDate": this.setFormatDate(new Date(workflowInstanceDataFields.StartDate), new Date(workflowInstanceDataFields.EndDate), workflowInstanceDataFields.IsAllDayEvent),
-        }
-
-        this.allProcessesList.push(task);
-        this.allProcessesList = removeDuplicate(this.allProcessesList)
-        this.allProcessesList = this.sortService.sortDate(this.allProcessesList, 'CreateDate')
-
-      });
-      console.log("All process from db ", allprocess)
-    })
   }
 
   sortArrayISODate(myArray: any) {
@@ -495,6 +537,7 @@ export class GabineteDigitalPage implements OnInit, DoCheck {
     let allProcessesList = allPreocesses_;
 
     allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Conhecimento')
+    allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Revisar Diploma')
 
     if (!this.p.userRole(['PR'])) {
       allProcessesList = allProcessesList.filter(element => element.activityInstanceName != 'Assinar Diplomas')

src/app/pages/gabinete-digital/pendentes/pendentes.page.ts

@@ -14,6 +14,7 @@ import { SqliteService } from 'src/app/services/sqlite.service';
 import { BackgroundService } from 'src/app/services/background.service';
 import { Platform } from '@ionic/angular';
 import { SortService } from 'src/app/services/functions/sort.service';
+import { Storage } from '@ionic/storage';
 
 
 @Component({
@@ -47,6 +48,7 @@ export class PendentesPage implements OnInit {
     private platform: Platform,
     private backgroundservices: BackgroundService,
     private sortService: SortService,
+    private storage: Storage
   ) {
     this.loggeduser = authService.ValidatedUser;
     this.profile = 'mdgpr';
@@ -104,6 +106,9 @@ export class PendentesPage implements OnInit {
       pendentesList = removeDuplicate(pendentesList)
       pendentesList = this.sortService.sortDate(pendentesList, 'CreateDate');
       this.listToPresent = pendentesList;
+      this.storage.set('pendente-list',pendentesList).then(() => {
+        console.log('Pendente list SAVED')
+      })
       this.skeletonLoader = false;
 
     }, (error) => {
@@ -116,34 +121,41 @@ export class PendentesPage implements OnInit {
 
   getFromDb() {
 
-    this.platform.ready().then(() => {
-      this.sqliteservice.getAllProcess().then((process: any[]) => {
-        var pendingList = []
-        console.log('Pendentes off off',process )
-        process.forEach(element => {
-          var workflow = JSON.parse(element.workflowInstanceDataFields);
-          if (workflow.Status === "Pending") {
-            let task = {
-              "CreateDate": new Date(element.taskStartDate),
-              "DocumentsQty": element.totalDocuments,
-              "FolderID": workflow.FolderID,
-              "Folio": workflow.Subject,
-              "Senders": workflow.Sender,
-              "SerialNumber": element.serialNumber,
-              "Status": workflow.Status,
-              "WorkflowName": element.workflowDisplayName
-
-            }
-            pendingList.push(task)
-          }
-        });
-
-        pendingList = this.sortService.sortDate(pendingList, 'CreateDate');
-        this.listToPresent = pendingList;
-        console.log('pendentes', pendingList)
-
+    if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
+      this.storage.get('pendente-list').then((pendentes) => {
+        this.listToPresent =pendentes
       })
-    })
+    } else {
+
+      this.platform.ready().then(() => {
+        this.sqliteservice.getAllProcess().then((process: any[]) => {
+          var pendingList = []
+          console.log('Pendentes off off',process )
+          process.forEach(element => {
+            var workflow = JSON.parse(element.workflowInstanceDataFields);
+            if (workflow.Status === "Pending") {
+              let task = {
+                "CreateDate": new Date(element.taskStartDate),
+                "DocumentsQty": element.totalDocuments,
+                "FolderID": workflow.FolderID,
+                "Folio": workflow.Subject,
+                "Senders": workflow.Sender,
+                "SerialNumber": element.serialNumber,
+                "Status": workflow.Status,
+                "WorkflowName": element.workflowDisplayName
+  
+              }
+              pendingList.push(task)
+            }
+          });
+  
+          pendingList = this.sortService.sortDate(pendingList, 'CreateDate');
+          this.listToPresent = pendingList;
+          console.log('pendentes', pendingList)
+  
+        })
+      })
+    }
   }
 
   async refreshing() {

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

@@ -172,20 +172,23 @@ export class NewPublicationPage implements OnInit {
     this.capturedImageTitle = new Date().getTime() + '.jpeg';
   } */
 
-  laodPicture() {
-    const input = this.fileLoaderService.createInput({
-      accept: ['image/apng', 'image/jpeg', 'image/png']
-    })
+  async laodPicture() {
+    
+    const capturedImage = await Camera.getPhoto({
+      quality: 90,
+      // allowEditing: true,
+      resultType: CameraResultType.Uri,
+      source: CameraSource.Photos
+    });
 
-    input.onchange = async () => {
-      const file = this.fileLoaderService.getFirstFile(input)
+    const response = await fetch(capturedImage.webPath!);
+    const blob = await response.blob();
 
-      const imageData =  await this.fileToBase64Service.convert(file)
-      this.capturedImage = imageData;
-      this.capturedImageTitle = file.name
+    this.convertBlobToBase64Worker.postMessage(blob);
+    this.convertBlobToBase64Worker.onmessage = async (oEvent)=> {
+      this.capturedImage = oEvent.data
 
-      console.log(this.capturedImage)
-    };
+    }
 
   }
 

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

@@ -38,11 +38,15 @@
         *ngFor="let publication of getpublication"
         (click)="goToPublicationDetail(publication.DocumentId)"
       >
-        <div *ngIf="publication.FileBase64.length > 30" class="post-img">
-          <ion-img src="{{publication.FileBase64}}" alt="image"></ion-img>
-        </div>
-        <div *ngIf="publication.FileBase64.length < 30" class="post-img">
-          <img src="/assets/icon/icon-no-image.svg" alt="image">
+        <div *ngIf="publication.FileBase64 != null">
+          <div *ngIf="publication.FileBase64.length < 30; else imageLoaded" class="post-img">
+            <img src="/assets/icon/icon-no-image.svg">
+          </div>
+          <ng-template #imageLoaded>
+            <div *ngIf="publication.FileBase64.length > 30" class="post-img">
+              <img src="{{publication.FileBase64}}" alt="">
+            </div>
+          </ng-template>
         </div>
         <div class="post-content px-20">
           <div class="post-title-time">

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

@@ -68,15 +68,16 @@ export class ViewPublicationsPage implements OnInit {
     if (typeof (this.folderId) == 'object') {
       this.folderId = this.folderId['ProcessId']
     }
-    this.testForkJoin()
+    //this.testForkJoin()
     this.getPublicationDetail();
-    setTimeout(() => {
+    this.getPublicationsIds();
+    /* setTimeout(() => {
       this.getPublicationsIds();
-    }, 1000);
+    }, 1000); */
 
     this.backgroundservice.registerBackService('Online', () => {
       this.getPublicationDetail();
-      this.testForkJoin()
+      //this.testForkJoin()
 
     })
 
@@ -91,18 +92,18 @@ export class ViewPublicationsPage implements OnInit {
     // if (typeof (this.id == 'object') {
     //   this.id = this.id['ProcessId']
     // }
-    this.testForkJoin()
-    this.getPublicationDetail();
+    //this.testForkJoin()
+    //this.getPublicationDetail();
     // this.getPublicationsIds();
   }
 
   doRefresh = (event) => {
-    setTimeout(() => {
-      this.testForkJoin()
+    //setTimeout(() => {
+      //this.testForkJoin()
       this.getPublicationDetail();
-      // this.getPublicationsIds();
+      this.getPublicationsIds();
       event.target.complete();
-    }, 3000);
+    //}, 3000);
 
   }
 
@@ -116,13 +117,14 @@ export class ViewPublicationsPage implements OnInit {
   }
 
   getPublicationDetail() {
-    this.publications.GetPresidentialAction(this.folderId).subscribe(res=>{
+    this.publications.GetPresidentialAction(this.folderId).subscribe(res => {
       console.log(res);
       this.item = res;
+      this.sqliteservice.updatePublicationsDetails(this.folderId, JSON.stringify(res));
     });
   }
 
-// goes to fork
+  // goes to fork
   // getPublicationsIds() {
 
   //   this.showLoader = true;
@@ -138,22 +140,22 @@ export class ViewPublicationsPage implements OnInit {
 
     this.showLoader = true;
     const folderId = this.folderId
-
+    this.getFromDB()
     this.publications.GetPublicationsImages(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);
-         })
-       } */
+      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)
@@ -162,13 +164,13 @@ export class ViewPublicationsPage implements OnInit {
           this.publicationList.push(ress);
         })
 
-      });
-
+      }); */
+      console.log('PUBLICATIONS IMAGEs',this.publicationList)
       this.sqliteservice.updateactions(this.folderId, JSON.stringify(this.publicationList));
+      console.log('PUBLICATIONS IMAGEs',this.publicationList)
 
       this.publicationListStorage.add(folderId, this.publicationList)
       this.getpublication = this.publicationList;
-
       this.showLoader = false;
 
       /*  this.publicationList = new Array();
@@ -189,7 +191,7 @@ export class ViewPublicationsPage implements OnInit {
 
     this.showLoader = true;
     const folderId = this.folderId
-
+    this.getFromDB();
     this.publications.GetPublications(this.folderId).subscribe(res => {
 
       console.log(this.folderId)
@@ -223,13 +225,13 @@ export class ViewPublicationsPage implements OnInit {
     });
   }
 
-  testForkJoin(){
+  testForkJoin() {
     forkJoin([
       this.getPublicationsIds(),
       this.getPublications(),
 
 
-    ]).subscribe(allResults =>{
+    ]).subscribe(allResults => {
       this.publicationList = allResults[2]
     })
   }
@@ -238,7 +240,7 @@ export class ViewPublicationsPage implements OnInit {
 
     this.sqliteservice.getActionById(this.folderId).then((publications) => {
       console.log('publications', publications)
-      let item = {
+      /* let item = {
         ActionType: publications[0].ActionType,
         DateBegin: publications[0].DateBegin,
         DateEnd: publications[0].DateEnd,
@@ -246,10 +248,11 @@ export class ViewPublicationsPage implements OnInit {
         Detail: publications[0].Detail,
         ProcessId: publications[0].ProcessId
       }
-      this.publicationDitails = item;
+      this.publicationDitails = item; */
+      this.item = this.isJson(publications[0].publicationsDetails);
 
       let publicationArray = [];
-      JSON.parse(publications[0].publications).forEach(element => {
+      this.isJson(publications[0].publications).forEach(element => {
         let publicationlis = {
           DateIndex: element.DateIndex,
           DatePublication: element.DatePublication,
@@ -264,11 +267,20 @@ export class ViewPublicationsPage implements OnInit {
         publicationArray.push(publicationlis);
 
       });
-
+      
       this.getpublication = publicationArray;
     })
   }
 
+  isJson(str) {
+    try {
+      JSON.parse(str);
+    } catch (e) {
+      return str;
+    }
+    return JSON.parse(str);
+  }
+
   async AddPublication(publicationType: any, folderId: any) {
     const modal = await this.modalController.create({
       component: NewPublicationPage,

src/app/services/attachments.service.ts

@@ -3,8 +3,8 @@ import { Attachment, EventAttachment } from '../models/attachment.model';
 import { Observable } from 'rxjs';
 import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
 import { environment } from 'src/environments/environment';
-import { AuthService } from '../services/auth.service';
 import { LoginUserRespose } from '../models/user.model';
+import { SessionStore } from '../store/session.service';
 
 @Injectable({
   providedIn: 'root'
@@ -14,12 +14,53 @@ export class AttachmentsService {
   loggeduser: LoginUserRespose;
   headers: HttpHeaders;
 
-  constructor(private http: HttpClient, user: AuthService) {
-    this.loggeduser = user.ValidatedUser;
+  constructor(private http: HttpClient) {
+    this.loggeduser = SessionStore.user
     this.headers = new HttpHeaders();
-    this.headers = this.headers.set('Authorization', this.loggeduser.BasicAuthKey);
+    this.headers = this.headers.set('Authorization', SessionStore.user.BasicAuthKey);
   }
 
+  uploadFile(formData:any) {
+
+    console.log('UPLOAD file', formData)
+
+    //const geturl = environment.apiURL + 'Tasks/DelegateTask';
+    const geturl = environment.apiURL + 'ObjectServer/UploadFiles';
+
+    let options = {
+      headers: this.headers
+    };
+
+    return this.http.post(`${geturl}`, formData, options);
+  }
+
+  getFile(guid:any) {
+    const geturl = environment.apiURL + 'lakefs/StreamFile';
+    let params = new HttpParams();
+
+    params = params.set("path", guid);
+
+    this.headers = this.headers.set('responseType', 'blob');
+    this.headers = this.headers.set('Content-Type', 'application/octet-stream');
+
+    let options = {
+      headers: this.headers,
+      params: params
+    };
+    return this.http.get<any>(`${geturl}`, options);
+  }
+
+  downloadFile(guid:any) {
+
+    let downloadUrl = environment.apiURL +'objectserver/streamfiles?path='+guid;
+    var name = new Date().getTime();
+    return this.http.get(downloadUrl, {
+      responseType: "arraybuffer",
+      reportProgress: true, observe: 'events'
+    })
+
+  }
+  
   getAttachmentsBySerial(serialNumber: string): Observable<Attachment[]>{
     let geturl = environment.apiURL + 'attachments/GetAttachments';
     let params = new HttpParams();

src/app/services/auth.service.ts

@@ -12,6 +12,12 @@ import { AESEncrypt } from '../services/aesencrypt.service';
 import { CookieService } from 'ngx-cookie-service';
 import { WsChatService } from 'src/app/services/chat/ws-chat.service';
 import { Router } from '@angular/router';
+import { NfService } from 'src/app/services/chat/nf.service'
+import { MessageService } from 'src/app/services/chat/message.service';
+import { ProcessesService } from 'src/app/services/processes.service';
+import { AttachmentsService } from 'src/app/services/attachments.service';
+import { RoomService } from './chat/room.service';
+import { Storage } from '@ionic/storage';
 @Injectable({
   providedIn: 'root'
 })
@@ -33,7 +39,11 @@ export class AuthService {
     private aesencrypt: AESEncrypt,
     private cookieService: CookieService,
     private WsChatService: WsChatService,
-    private router: Router,) {
+    private router: Router,
+    private NfService:NfService,
+    private processesService: ProcessesService,
+    private AttachmentsService: AttachmentsService,
+    private storage: Storage ) {
 
       this.headers = new HttpHeaders();
 
@@ -41,13 +51,7 @@ export class AuthService {
         this.ValidatedUser = SessionStore.user
 
         console.log('login', SessionStore.user.RochetChatUser, SessionStore.user.Password)
-        this.WsChatService.connect();
-        this.WsChatService.login().then((message) => {
-          console.log('rocket chat login successfully', message)
-          this.WsChatService.setStatus('busy')
-        }).catch((message)=>{
-          console.log('rocket chat login failed', message)
-        })
+        this.loginToChatWs()
 
       }
 
@@ -119,16 +123,17 @@ export class AuthService {
       let responseChat = await this.httpService.post('login', postData).toPromise();
 
       if(responseChat) {
-        console.log('Login to Rocket chat OK', responseChat);
+
+        this.loginToChatWs()
+
+        console.log('Login to Rocket chat OK');
         this.ValidatedUserChat = responseChat;
         localStorage.setItem('userChat', JSON.stringify(responseChat));
         this.storageService.store(AuthConnstants.AUTH, responseChat);
-        //return true;
       }
       else{
         console.log('Network error');
         this.presentAlert('Network error');
-        //return false;
       }
 
       this.autoLoginChat(expirationDate.getTime() - date, user);
@@ -140,6 +145,58 @@ export class AuthService {
       }, expirationDate)
     }
 
+    private loginToChatWs() {
+      setTimeout(()=>{
+
+        this.WsChatService.connect();
+        this.WsChatService.login().then((message) => {
+          console.log('rocket chat login successfully', message)
+          this.WsChatService.setStatus('online')
+        }).catch((message)=>{
+          console.log('rocket chat login failed', message)
+        })
+
+
+        this.NfService.beforeSendAttachment = async (message: MessageService, room?: RoomService) => {
+
+          if(message.hasFile) {
+            if(message.file.type != 'application/webtrix') {
+              const formData = message.temporaryData
+
+              try {
+                let guid: any = await this.AttachmentsService.uploadFile(formData).toPromise()
+                message.file.guid = guid.path
+                await this.storage.set(guid.path, message.file.image_url).then(() => {
+                  console.log('add picture to chat IMAGE SAVED')
+                  message.getFileFromDb()
+                });
+
+                return true
+              } catch(e) {
+                return false
+              }
+
+            } else {
+              try {
+                const res = message.temporaryData
+                let url = await this.processesService.GetDocumentUrl(res.data.selected.Id, res.data.selected.ApplicationType).toPromise();
+                let url_no_options: string = url.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1");
+                message.attachments[0].title_link = url_no_options
+                message.attachments[0].message_link = url_no_options
+                return true
+
+              } catch(e) {
+                return false
+              }
+
+            }
+          }
+
+          return false
+        }
+      }, 1)
+    }
+
     autologout(expirationDate:number){
       setTimeout(()=>{
         this.logout();

src/app/services/camera.service.spec.ts

@@ -1,13 +1,13 @@
 import { TestBed } from '@angular/core/testing';
 
-import { ChatUserService } from './chat-user.service';
+import { CameraService } from './camera.service';
 
-describe('ChatUserService', () => {
-  let service: ChatUserService;
+describe('CameraService', () => {
+  let service: CameraService;
 
   beforeEach(() => {
     TestBed.configureTestingModule({});
-    service = TestBed.inject(ChatUserService);
+    service = TestBed.inject(CameraService);
   });
 
   it('should be created', () => {

src/app/services/camera.service.ts

@@ -0,0 +1,36 @@
+import { Injectable } from '@angular/core';
+import { Camera,  CameraResultType, CameraSource, Photo} from '@capacitor/camera';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class CameraService {
+
+  constructor() { }
+
+
+  async takePicture(){
+
+    return new Promise<Photo>(async (resolve, reject)=>{
+
+      console.log('add camera to picture')
+
+      const image = await Camera.getPhoto({
+        quality: 50,
+        allowEditing: false,
+        resultType: CameraResultType.Uri,
+        source: CameraSource.Camera // Camera, Photos or Prompt!
+      });
+  
+      if (image) {
+        resolve(image)
+        
+      } else {
+        reject('Error saving image')
+      }
+  
+        //this.capturedImage = this.capturedImage;
+    })
+
+  }
+}

src/app/services/chat/chat-user.service.ts

@@ -1,9 +0,0 @@
-import { Injectable } from '@angular/core';
-
-@Injectable({
-  providedIn: 'root'
-})
-export class ChatUserService {
-
-  constructor() { }
-}

src/app/services/chat/message.service.ts

@@ -1,8 +1,10 @@
 import { Injectable } from '@angular/core';
 import { Message } from 'src/app/models/chatMethod';
-import { chatHistory, ChatMessage, File } from 'src/app/models/chatMethod'
 import { Storage } from '@ionic/storage';
-
+import { SessionStore } from 'src/app/store/session.service';
+import { capitalizeTxt } from 'src/plugin/text'
+import { NfService } from 'src/app/services/chat/nf.service'
+import { WsChatService } from 'src/app/services/chat/ws-chat.service';
 @Injectable({
   providedIn: 'root'
 })
@@ -17,40 +19,105 @@ export class MessageService {
   u = {}
   t = ''
   _id  =''
-  _updatedAt = {}
+  _updatedAt
   file
   attachments
+  offline = true
+  displayType = ''
+  temporaryData: any = {}
+  hasFile = false
+  hasSendAttachment = false
 
-  constructor(private storage: Storage) {
-   }
+  constructor(private storage: Storage,
+    private NfService: NfService,
+    private WsChatService: WsChatService) {
+  }
 
-  setData({customFields, channels, mentions, msg ,rid ,ts, u, t, _id, _updatedAt, file, attachments}:Message) {
-    this.customFields = customFields
-    this.channels = channels
-    this.mentions = mentions
-    this.msg = msg
+  setData({customFields, channels, mentions, msg ,rid ,ts, u, t, _id, _updatedAt, file, attachments, temporaryData}:Message) {
+    this.customFields = customFields 
+    this.channels = channels || []
+    this.mentions = mentions || []
+    this.msg = msg || ""
     this.rid = rid
     this.ts = ts
-    this.u = u
+    this.u = u || { name: this.usernameToDisplayName(SessionStore.user.RochetChatUser), username: SessionStore.user.RochetChatUser, _id: ""}
     this.t = t
     this._id = _id
-    this._updatedAt = _updatedAt
+    this._updatedAt = _updatedAt || new Date().getTime()
     this.file = file
     this.attachments = attachments
+    this.temporaryData = temporaryData
 
+    if(!this.ts) {
+      this.offline = true
+    } else {
+      this.offline = false
+    }
 
     if (this.file) {
+      if(this.file.type) {
+        if(typeof(this.file.type) == 'string') {
+          this.hasFile = true
+        }
+      }
+    }
+
+    if(this.hasFile) {
+      this.getFileFromDb()
+      if(this.file.type != 'application/webtrix') {
+        this.displayType = this.file.type.replace('application/','').toUpperCase()
+      }
+    }
+  }
+
+  private usernameToDisplayName(username) {
+
+    const firstName = capitalizeTxt(username.split('.')[0])
+    const lastName =  capitalizeTxt(username.split('.')[1])
+    return firstName + ' ' + lastName
+  } 
+
+  getFileFromDb() {
+
+    if(this.hasFile) {
       if (this.file.guid) {
         this.storage.get(this.file.guid).then((image) => {
-          // console.log('IMAGE FROM STORAGE', image)
-          this.file.image_url = image
+          if(image != null) {
+            this.file.image_url = image
+          }
         });
       }
     }
   }
 
-  delete() {}
+  sendFile() {
+    if(this.file == null && this.attachments  == null) {
+      console.log('simple send')
+      this.WsChatService.send({roomId:this.rid, msg:this.msg}).then((data: any) => {
+        let ChatMessage = data.result
+        this.redefinedMessage(this, ChatMessage)
+      })
+    } else {
+      console.log('complex send')
 
-  showDateDuration() {}
+      const result = this.NfService.beforeSendAttachment(this)
+      
+
+      if(result) {
+        this.hasSendAttachment = true
+  
+        this.WsChatService.send({roomId:this.rid, msg: this.msg, attachments: this.attachments, file: this.file}).then((data: any) => {
+          console.log('send sucees',  data.result)
+          let ChatMessage = data.result
+          this.redefinedMessage(this, ChatMessage)
+        })
+      }
+      
+    }
+  }
+
+  redefinedMessage(messagem, ChatMessage){ 
+    this.setData(ChatMessage)
+  }
 
 }

src/app/services/chat/nf.service.spec.ts

@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { NfService } from './nf.service';
+
+describe('NfService', () => {
+  let service: NfService;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+    service = TestBed.inject(NfService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+});

src/app/services/chat/nf.service.ts

@@ -0,0 +1,14 @@
+import { Injectable } from '@angular/core';
+import { MessageService } from './message.service';
+import { RoomService } from './room.service';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class NfService {
+
+  beforeSendAttachment  =  async (message: MessageService, room?: RoomService): Promise<boolean> => new Promise ((resolve, reject)=> (resolve(true)))
+
+
+  constructor() { }
+}

src/app/services/chat/room.service.ts

@@ -1,7 +1,6 @@
 import { Injectable } from '@angular/core';
 import { WsChatService } from 'src/app/services/chat/ws-chat.service';
 import { MessageService } from 'src/app/services/chat/message.service';
-import { ChatUserService } from 'src/app/services/chat/chat-user.service';
 import { showDateDuration } from 'src/plugin/showDateDuration';
 import { ToastsService } from '../toast.service';
 import { chatHistory, ChatMessage } from 'src/app/models/chatMethod';
@@ -13,7 +12,10 @@ import { SessionStore } from 'src/app/store/session.service';
 import { capitalizeTxt } from 'src/plugin/text'
 import { SortService } from '../functions/sort.service';
 import { chatUser } from 'src/app/models/chatMethod';
-
+import { environment } from 'src/environments/environment';
+import { ChatService } from 'src/app/services/chat.service';
+import { NfService } from 'src/app/services/chat/nf.service'
+import alasql from 'alasql'
 @Injectable({
   providedIn: 'root'
 })
@@ -22,8 +24,7 @@ export class RoomService {
   messages: MessageService[] = []
   storageMessage: any[] = [];
   lastMessage: MessageService;
-
-  chatUser: ChatUserService[] = []
+  
   customFields: any;
   id = ''
   t = ''
@@ -51,6 +52,9 @@ export class RoomService {
     return []
   }
 
+  sortRoomList = () => {}
+  uploadAttachment = (formData) => {}
+
   constructor(
     public WsChatService: WsChatService,
     private MessageService: MessageService,
@@ -59,11 +63,13 @@ export class RoomService {
     private sqlservice: SqliteService,
     private NativeNotificationService: NativeNotificationService,
     private sortService: SortService,
+    private chatService: ChatService,
+    private NfService: NfService
   ) {
     this.NativeNotificationService.askForPermission()
   }
 
-  setData({ customFields, id, name, t, lastMessage = new MessageService(this.storage), _updatedAt }) {
+  setData({ customFields, id, name, t, lastMessage = new MessageService(this.storage, this.NfService, this.WsChatService), _updatedAt }) {
     this.customFields = customFields
     this.id = id
     this.name = name
@@ -74,6 +80,11 @@ export class RoomService {
     this.calDateDuration()
   }
 
+
+  isSenderIsNotMe(ChatMessage) {
+    return SessionStore.user.RochetChatUser != ChatMessage.u.username
+  }
+
   receiveMessage() {
 
     this.WsChatService.updateRoomEventss(
@@ -81,40 +92,30 @@ export class RoomService {
       "stream-room-messages",
       (ChatMessage) => {
         ChatMessage = ChatMessage.fields.args[0]
-        ChatMessage = this.fix_updatedAt(ChatMessage)
-        console.log('recivemessage', ChatMessage)
 
-        const message = this.prepareMessage(ChatMessage)
+        if(environment.chatOffline == false || this.isSenderIsNotMe(ChatMessage)) {
+          
+          ChatMessage = this.fix_updatedAt(ChatMessage)
+          console.log('recivemessage', ChatMessage)
+    
+          const message = this.prepareMessage(ChatMessage)
 
-        if(message._updatedAt == undefined){
-          message._updatedAt = new Date().getTime();
-        }
-
-        this.lastMessage = message
-        if (message.t == 'r') { this.name = message.msg }
-        this.calDateDuration(message._updatedAt)
-        this.messages.push(message)
-
-        setTimeout(() => {
-          this.scrollDown()
-        }, 100)
-
-        if(SessionStore.user.RochetChatUser != ChatMessage.u.username) {
+          this.lastMessage = message
+          if (message.t == 'r') { this.name = message.msg }
+          this.calDateDuration(ChatMessage._updatedAt)
+  
+          setTimeout(() => {
+            this.scrollDown()
+          }, 100)
+  
           this.NativeNotificationService.sendNotificationChat({
             message: message.msg,
             title: this.name
           });
+
+          this.addMessageDB(ChatMessage)
+
         }
-
-        // save to ionic storage
-        this.storage.get('chatmsg' + this.id).then((messages: any) => {
-          const newListMessages = messages.push(ChatMessage)
-
-          this.storage.set('chatmsg' + this.id, newListMessages).then((value) => {
-            console.log('MSG SAVED ON STORAGE', value)
-          });
-        })
-
       }
     )
 
@@ -134,6 +135,16 @@ export class RoomService {
     this.WsChatService.registerCallback
   }
 
+
+  addMessageDB(ChatMessage) {
+    this.storage.get('chatmsg' + this.id).then((messages: any = []) => {
+      delete ChatMessage.temporaryData
+      messages.push(ChatMessage)
+
+      this.storage.set('chatmsg' + this.id, messages)
+    })
+  }
+
   async receiveMessageDelete() {
 
     this.WsChatService.updateRoomEventss(
@@ -195,11 +206,73 @@ export class RoomService {
   /**
    *  @description sen text message
    */
-  send() {
-    this.WsChatService.send(this.id, this.message)
+  async send({file = null, attachments = null, temporaryData = {}}) {
+
+
+    let offlineChatMessage = {
+      rid: this.id,
+      msg: this.message,
+      attachments,
+      file,
+      temporaryData
+    }
+
+    console.log('offlineChatMessage', offlineChatMessage)
+    
+    this.addMessageDB(offlineChatMessage)
+    const message: MessageService = this.prepareMessage(offlineChatMessage)
+
+    setTimeout(() => {
+      this.scrollDown()
+    }, 150)
+
+    this.lastMessage = message
+
+
+    if(file == null && attachments  == null) {
+      console.log('simple send')
+      this.WsChatService.send({roomId:this.id, msg:message.msg}).then((data: any) => {
+        let ChatMessage = data.result
+        this.redefinedMessage(message, ChatMessage)
+      })
+    } else {
+      console.log('complex send')
+
+      const result = await this.NfService.beforeSendAttachment(message, this)
+
+
+      if(result) {
+        message.hasSendAttachment = true
+  
+        this.WsChatService.send({roomId:this.id, msg:message.msg, attachments:offlineChatMessage.attachments, file:offlineChatMessage.file}).then((data: any) => {
+          console.log('send sucees',  data.result)
+          let ChatMessage = data.result
+          this.redefinedMessage(message, ChatMessage)
+        })
+      }
+      
+    }
+
+
+    this.calDateDuration(message._updatedAt)
+    this.sortRoomList()
+    
     this.message= ''
   }
 
+  redefinedMessage  (message: MessageService, ChatMessage) {
+
+    ChatMessage = this.fix_updatedAt(ChatMessage)
+
+    message.setData(ChatMessage)
+
+    if( new Date(this.lastMessage._updatedAt).getTime() <  new Date(message._updatedAt).getTime()) {
+      this.lastMessage = message
+      this.calDateDuration(message._updatedAt)
+    }
+    this.sortRoomList()
+  }
+
 
   typing(text:string = this.message) {
 
@@ -267,42 +340,58 @@ export class RoomService {
   }
 
 
+  async restoreMessageFromDB() {
+    await this.storage.get('chatmsg' + this.id).then( async (messages = []) => {
+
+      if(messages==null) messages = []
+
+      await messages.forEach( async (ChatMessage, index) => {
+        const wewMessage = this.prepareMessage(ChatMessage)
+
+        if(wewMessage.offline == true) {
+          // this.WsChatService.send({roomId:this.id, msg:wewMessage.msg, attachments:wewMessage.attachments, file: wewMessage.file}).then((data: any) => {
+          //   let _ChatMessage = data.result
+          //   this.redefinedMessage(wewMessage, _ChatMessage)
+          //   messages[index] = _ChatMessage
+          //   this.storage.set('chatmsg' + this.id, messages)
+          // })
+        }
+
+      });
+
+      this.messages = alasql('SELECT * FROM ? ORDER BY  _updatedAt',[ this.messages]);
+      setTimeout(()=> {
+        this.scrollDown()
+      }, 50)
+      
+      
+    })
+  }
+
   // runs onces only
-  loadHistory(limit = 100) {
+  async loadHistory(limit = 100) {
 
     if (this.hasLoadHistory) { return false }
 
-    this.storage.get('chatmsg' + this.id).then((messages = []) => {
+    await this.restoreMessageFromDB()
 
-      let localMessages = []
-
-      messages.forEach(message => {
-        const wewMessage = this.prepareMessage(message)
-        localMessages.push(wewMessage)
-      });
-
-      this.messages = localMessages
-    })
-
-    this.WsChatService.loadHistory(this.id, limit).then((chatHistory:chatHistory) => {
+    await this.WsChatService.loadHistory(this.id, limit).then( async (chatHistory:chatHistory) => {
       console.log('loadHistory', chatHistory)
+      this.messages = []
 
-      let localMessages = []
+      await chatHistory.result.messages.reverse().forEach( async (message) => {
+        this.prepareMessage(message)
 
-      chatHistory.result.messages.reverse().forEach(message => {
-
-        const wewMessage = this.prepareMessage(message)
-
-        localMessages.push(wewMessage)
+        // const result = alasql(`SELECT * FROM ? WHERE _id = "${message._id}" `,[ this.messages]);
+        // if(result.length == 0) {
+        //   this.prepareMessage(message)
+        //   this.storage.set('chatmsg' + this.id, chatHistory.result.messages.concat([message]))
+        // }
+        
       });
 
-      this.messages = localMessages
-
       console.log(chatHistory.result.messages);
 
-
-      this.storage.set('chatmsg' + this.id, chatHistory.result.messages.reverse())
-
     })
 
     setTimeout(() => {
@@ -314,11 +403,12 @@ export class RoomService {
 
 
 
-  prepareMessage(message) {
+  prepareMessage(message): MessageService {
     message = this.fix_updatedAt(message)
-    const wewMessage = new MessageService(this.storage)
+    const wewMessage = new MessageService(this.storage, this.NfService, this.WsChatService)
     wewMessage.setData(message)
-
+    this.messages.push(wewMessage)
+    
     return wewMessage
   }
 
@@ -344,9 +434,11 @@ export class RoomService {
     if (message.result) {
       //console.log('FIX UPDATE ', message.result)
       message.result._updatedAt = message.result._updatedAt['$date']
-    } else {
-      //console.log('FIX UPDATE 11', message)
-      message._updatedAt = message._updatedAt['$date']
+    } else if(message._updatedAt) {
+      if(message._updatedAt.hasOwnProperty('$date')) {
+        // console.log('FIX UPDATE 11', message)
+        message._updatedAt = message._updatedAt['$date']
+      }
     }
     return message
   }

src/app/services/chat/ws-chat-methods.service.ts

@@ -12,7 +12,7 @@ import { ChatService } from 'src/app/services/chat.service';
 import { NativeNotificationService } from 'src/app/services/native-notification.service';
 import { SortService } from '../functions/sort.service';
 import { chatUser } from 'src/app/models/chatMethod';
-
+import { NfService } from 'src/app/services/chat/nf.service'
 @Injectable({
   providedIn: 'root'
 })
@@ -41,7 +41,8 @@ export class WsChatMethodsService {
     private sqlservice: SqliteService,
     private NativeNotificationService: NativeNotificationService,
     private sortService: SortService,
-    private ChatService: ChatService
+    private ChatService: ChatService,
+    private NfService: NfService
   ) {
     (async()=>{
       await this.getAllRooms();
@@ -68,6 +69,13 @@ export class WsChatMethodsService {
 
   }
 
+  getRoomFromDb() {
+    this.storage.get('Rooms').then((rooms) => {
+      rooms.result.update.forEach((roomData: room) => {
+        this.prepareRoom(roomData);
+      });
+    })
+  };
   openRoom(roomId) {
 
     if(this.currentRoom) {
@@ -92,9 +100,12 @@ export class WsChatMethodsService {
 
   async getAllRooms () {
     this.loadingWholeList = true
-
+    //this.getRoomFromDb();
     const rooms = await this.WsChatService.getRooms();
+    await this.storage.remove('Rooms');
+    await this.storage.set('Rooms', rooms);
 
+    // console.log("ROOMS" + JSON.stringify(rooms))
     this.WsChatService.registerCallback({
       type:'Onmessage',
       funx:(message)=>{
@@ -131,7 +142,7 @@ export class WsChatMethodsService {
   /**
    * @description sort room list by last message date
    */
-  sortRoomList() {
+  sortRoomList =() => {
     this._dm = this.sortService.sortDate(this._dm,'_updatedAt').reverse()
     this._group = this.sortService.sortDate(this._group,'_updatedAt').reverse()
   }
@@ -193,7 +204,7 @@ export class WsChatMethodsService {
   prepareRoom(roomData) {
     let room:RoomService;
 
-    room = new RoomService(this.WsChatService, new MessageService(this.storage), this.storage, this.platform, this.sqlservice, this.NativeNotificationService, this.sortService)
+    room = new RoomService(this.WsChatService, new MessageService(this.storage, this.NfService, this.WsChatService), this.storage, this.platform, this.sqlservice, this.NativeNotificationService, this.sortService, this.ChatService, this.NfService)
 
     room.setData({
       customFields: roomData.customFields,
@@ -207,6 +218,7 @@ export class WsChatMethodsService {
     room.receiveMessage()
     room.getAllUsers = this.getUsers
     room.receiveMessageDelete();
+    room.sortRoomList = this.sortRoomList
 
     let roomId = this.getRoomId(roomData)
 

src/app/services/chat/ws-chat.service.ts

@@ -14,7 +14,15 @@ export class WsChatService {
   isLogin = false;
   loginResponse = {}
 
-  constructor() {}
+  constructor() {
+
+
+    window.addEventListener('online', ()=>{
+      this.connect()
+      this.login()
+    });
+
+  }
 
   connect() {
     // dont connect if is already connected
@@ -30,8 +38,8 @@ export class WsChatService {
       support: ["1"]
     }
 
-    this.ws.send({message, loginRequired: false})
-    this.ws.send({message:{msg:"pong"}, loginRequired: false})
+    this.ws.send({message, loginRequired: false, requestId: 'connectMessage'})
+    this.ws.send({message:{msg:"pong"}, loginRequired: false, requestId: 'connectPong'})
 
     this.ws.registerCallback({
       type:'Onmessage',
@@ -65,7 +73,7 @@ export class WsChatService {
         }
       ]
     }
-    this.ws.send({message, requestId, loginRequired: false})
+    this.ws.send({message, requestId: 'login', loginRequired: false})
 
 
     return new Promise((resolve, reject) => {
@@ -154,7 +162,7 @@ export class WsChatService {
   }
 
   // send message to room
-  send(roomId, msg) {
+  send({roomId, msg, attachments = null, file = null}) {
 
     const requestId =  uuidv4()
 
@@ -163,9 +171,10 @@ export class WsChatService {
       method: "sendMessage",
       id: requestId,
       params: [{
-        _id: uuidv4(),
         rid: roomId,
-        msg: msg
+        msg: msg,
+        attachments,
+        file
       }]
     }
 
@@ -173,7 +182,7 @@ export class WsChatService {
 
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', funx:(message)=>{
-        if(message.id == requestId || deepFind(message,'result.id') == requestId) { // same request send
+        if(message.id == requestId ) { // same request send
           resolve(message)
           return true
         }
@@ -198,7 +207,7 @@ export class WsChatService {
 
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', funx:(message)=>{
-        if(message.id == requestId || deepFind(message,'result.id') == requestId) { // same request send
+        if(message.id == requestId ) { // same request send
           resolve(message)
           return true
         }
@@ -224,7 +233,7 @@ export class WsChatService {
 
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', funx:(message)=>{
-        if(message.id == requestId || deepFind(message,'result.id') == requestId) { // same request send
+        if(message.id == requestId ) { // same request send
           resolve(message)
           return true
         }
@@ -247,7 +256,7 @@ export class WsChatService {
 
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', funx:(message)=>{
-        if(message.id == requestId || deepFind(message,'result.id') == requestId) { // same request send
+        if(message.id == requestId ) { // same request send
           resolve(message)
           return true
         }
@@ -302,7 +311,7 @@ export class WsChatService {
 
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', funx:(message)=>{
-        if(message.id == requestId || deepFind(message,'result.id') == requestId) { // same request send
+        if(message.id == requestId ) { // same request send
           resolve(message)
           return true
         }
@@ -329,7 +338,7 @@ export class WsChatService {
 
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', funx:(message)=>{
-        if(message.id == requestId || deepFind(message,'result.id') == requestId) { // same request send
+        if(message.id == requestId ) { // same request send
           resolve(message)
           return true
         }
@@ -409,7 +418,7 @@ export class WsChatService {
       ]
     }
 
-    this.ws.send({message, requestId})
+    this.ws.send({message, requestId: 'loadHistory'})
 
     return new Promise<chatHistory>((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', funx:(message)=>{
@@ -557,7 +566,7 @@ updateRoomEventss(roomId, collection:string, funx: Function, ) {
 
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', funx:(message)=>{
-        if(message.id == requestId || deepFind(message,'result.id') == requestId) { // same request send
+        if(message.id == requestId ) { // same request send
           resolve(message)
           return true
         }
@@ -584,7 +593,7 @@ updateRoomEventss(roomId, collection:string, funx: Function, ) {
 
     return new Promise((resolve, reject) => {
       this.ws.registerCallback({type:'Onmessage', funx:(message)=>{
-        if(message.id == requestId || deepFind(message,'result.id') == requestId) { // same request send
+        if(message.id == requestId ) { // same request send
           resolve(message)
           return true
         }
@@ -662,7 +671,7 @@ updateRoomEventss(roomId, collection:string, funx: Function, ) {
 
       if (this.ws.connected == false || loginRequired == true && this.isLogin == false) { // save data to send when back online
         // console.log('save msgQueue this.ws.connected == false || loginRequired == true && this.isLogin == false',this.ws.connected, loginRequired, this.isLogin)
-        console.log('save msgQueue', requestId)
+        console.log('save msgQueue', requestId, message)
 
         this.wsMsgQueue[requestId] = {message, requestId, loginRequired}
       } else {

src/app/services/functions/file.service.ts

@@ -1,21 +1,13 @@
 import { Injectable } from '@angular/core';
 import { FileLoaderService } from '../file/file-loader.service';
-import { FileToBase64Service } from '../file/file-to-base64.service';
 import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
-
-import { ChatService } from '../chat.service';
-import { ModalController, Platform,LoadingController } from '@ionic/angular';
-import { SearchPage } from 'src/app/pages/search/search.page';
-import { SearchList } from 'src/app/models/search-document';
-import { ProcessesService } from '../processes.service';
-import { ToastService } from '../toast.service';
-import { Camera,  CameraResultType, CameraSource, Photo} from '@capacitor/camera';
+import { LoadingController, Platform } from '@ionic/angular';
+import {Photo} from '@capacitor/camera';
+import { FileType } from 'src/app/models/fileType';
 import { Filesystem, Directory } from '@capacitor/filesystem';
-import { environment } from 'src/environments/environment';
-import { HttpClient, HttpEventType, HttpHeaders, HttpParams } from '@angular/common/http';
-import { Storage } from '@ionic/storage';
-const IMAGE_DIR = 'stored-images';
+import { FileToBase64Service } from 'src/app/services/file/file-to-base64.service';
 
+const IMAGE_DIR = 'stored-images';
 
 interface LocalFile {
   name: string;
@@ -31,111 +23,24 @@ export class FileService {
   images: LocalFile[] = [];
   capturedImage:any;
   capturedImageTitle:any;
-  documents:SearchList[] = [];
   showLoader: boolean;
 
   files: Set<File>;
   photos: any[] = [];
   idroom: any;
 
-  headers: HttpHeaders;
   downloadProgess = 0;
   downloadFilename: any;
+  convertBlobToBase64Worker;
 
   constructor(
     private fileLoaderService: FileLoaderService,
-    private fileToBase64Service: FileToBase64Service,
     private iab: InAppBrowser,
-    private chatService: ChatService,
-    private modalController: ModalController,
-    private processesService: ProcessesService,
-    private toastService: ToastService,
-    private platform: Platform,
     private loadingCtrl: LoadingController,
-    private http: HttpClient,
-    private storage: Storage
-  ) {
-    this.headers = new HttpHeaders();
-  }
+    private platform: Platform,
+    private fileToBase64Service: FileToBase64Service
+  ) {}
 
-  uploadFile(formData:any){
-
-    console.log('UPLOAD file', formData)
-
-    //const geturl = environment.apiURL + 'Tasks/DelegateTask';
-    const geturl = environment.apiURL + 'ObjectServer/UploadFiles';
-
-    let options = {
-      headers: this.headers
-    };
-
-    return this.http.post(`${geturl}`, formData, options);
-  }
-
-  getFile(guid:any){
-    const geturl = environment.apiURL + 'lakefs/StreamFile';
-    let params = new HttpParams();
-
-    params = params.set("path", guid);
-
-    this.headers = this.headers.set('responseType', 'blob');
-    this.headers = this.headers.set('Content-Type', 'application/octet-stream');
-
-    let options = {
-      headers: this.headers,
-      params: params
-    };
-    return this.http.get<any>(`${geturl}`, options);
-  }
-
-   downloadFile(guid:any) {
-
-    let downloadUrl = environment.apiURL +'objectserver/streamfiles?path='+guid;
-    var name = new Date().getTime();
-   return this.http.get(downloadUrl, {
-      responseType: "arraybuffer",
-      reportProgress: true, observe: 'events'
-    })
-
-  }
-
-  _arrayBufferToBase64( buffer ) {
-    var binary = '';
-    var bytes = new Uint8Array( buffer );
-    var len = bytes.byteLength;
-    for (var i = 0; i < len; i++) {
-        binary += String.fromCharCode( bytes[ i ] );
-    }
-    return window.btoa( binary );
-}
-
-
-  async takePicture() {
-    const capturedImage = await Camera.getPhoto({
-      quality: 90,
-      // allowEditing: true,
-      resultType: CameraResultType.Uri,
-      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';
-
-    let data = {
-      image:this.capturedImage,
-      name: this.capturedImageTitle
-    }
-
-    return data;
-  }
 
   convertBlobToBase64 = (blob: Blob) => new Promise((resolve, reject) => {
     const reader = new FileReader;
@@ -146,31 +51,9 @@ export class FileService {
     reader.readAsDataURL(blob);
   });
 
-  async loadPicture() {
-    const input = this.fileLoaderService.createInput({
-      accept: ['image/apng', 'image/jpeg', 'image/png', '.pdf']
-    })
 
-    input.onchange = async () => {
-      const file = this.fileLoaderService.getFirstFile(input)
 
-      console.log(file);
-
-      const imageData =  await this.fileToBase64Service.convert(file)
-      this.capturedImage = imageData;
-      this.capturedImageTitle = file.name;
-
-      let data = {
-        image:this.capturedImage,
-        name: this.capturedImageTitle
-      }
-
-      return data;
-    };
-  }
-
-  //new method1
-  async saveImage(photo: Photo, roomid: any) {
+  async saveImage(photo: Photo) {
     const base64Data = await this.readAsBase64(photo);
 
     const fileName = new Date().getTime() + '.jpeg';
@@ -180,9 +63,42 @@ export class FileService {
       directory: Directory.Data
     });
 
-    this.loadFiles(roomid);
   }
 
+  //new method 3
+  async loadFiles() {
+
+    const loading = await this.loadingCtrl.create({
+      message: 'Loading data...',
+    });
+    await loading.present();
+
+    return new Promise((resolve, reject)=>{
+      Filesystem.readdir({
+        path: IMAGE_DIR,
+        directory: Directory.Data,
+      }).then(result => {
+        console.log('ALL RESULTS', result.files[0])
+        let lastphoto = result.files[result.files.length - 1]
+        resolve(lastphoto)
+      },
+        async (err) => {
+          console.log('ERROR FILE DOSENT EXIST', err)
+          reject('ERROR FILE DOSENT EXIST')
+          // Folder does not yet exists!
+          await Filesystem.mkdir({
+            path: IMAGE_DIR,
+            directory: Directory.Data,
+            recursive: true
+          });
+        }
+      ).then(_ => {
+        loading.dismiss();
+      });
+    })
+  }
+
+
   //new method 2
   private async readAsBase64(photo: Photo) {
     if (this.platform.is('hybrid')) {
@@ -201,345 +117,61 @@ export class FileService {
     }
   }
 
-  //new method 3
-  async loadFiles(roomid) {
-    this.images = [];
 
-    const loading = await this.loadingCtrl.create({
-      message: 'Loading data...',
-    });
-    await loading.present();
-
-    Filesystem.readdir({
-      path: IMAGE_DIR,
+  async readFile(filePath) {
+    return await Filesystem.readFile({
+      path: filePath,
       directory: Directory.Data,
-    }).then(result => {
-      console.log('ALL RESULTS', result.files[0])
-      let lastphoto = result.files[result.files.length - 1]
-      this.loadFileData(lastphoto,roomid);
-    },
-      async (err) => {
-        console.log('ERROR FILE DOSENT EXIST', err)
-        // Folder does not yet exists!
-        await Filesystem.mkdir({
-          path: IMAGE_DIR,
-          directory: Directory.Data,
-          recursive: true
-        });
-      }
-    ).then(_ => {
-      loading.dismiss();
     });
   }
 
   //new method 4
-  async loadFileData(fileName: string, roomid: any) {
+  async loadFileData(fileName: string) {
     console.log('ALL PHOTOT FILE', fileName)
     // for (let f of fileNames) {
     const filePath = `${IMAGE_DIR}/${fileName}`;
 
-    const readFile = await Filesystem.readFile({
-      path: filePath,
-      directory: Directory.Data,
-    });
+    const readFile = await this.readFile(filePath)
 
-    this.images.push({
+    const image ={
       name: fileName,
       path: filePath,
       data: `data:image/jpeg;base64,${readFile.data}`,
-    });
+    };
 
-    console.log('ALL IMAGE', this.images)
+    console.log('ALL IMAGE', image)
 
-    this.capturedImage = this.images[0].data
+    const capturedImage = image.data
 
-    this.capturedImageTitle = new Date().getTime() + '.jpeg';
-    const base64 = await fetch(this.capturedImage);
-    const blob = await base64.blob();
-    const formData = new FormData();
-      formData.append("blobFile", blob);
-      console.log('ALL IMAGE', formData)
-    let guid: any = await this.uploadFile(formData).toPromise()
-      console.log(guid.path);
+    const capturedImageTitle = new Date().getTime() + '.jpeg';
 
 
-      this.downloadFile(guid.path).subscribe(async (event) => {
-
-        if (event.type === HttpEventType.DownloadProgress) {
-          //this.downloadProgess = Math.round((100 * event.loaded) / event.total);
-          //console.log('FILE TYPE 33', msg.file.type)
-        } else if (event.type === HttpEventType.Response) {
-          var fileImage = 'data:image/jpeg;base64,' + btoa(new Uint8Array(event.body).reduce((data, byte) => data + String.fromCharCode(byte), ''));
-          console.log('add picture to chat',fileImage);
-          await this.storage.set(guid.path, fileImage).then(() => {
-            console.log('add picture to chat IMAGE SAVED')
-            let body = {
-              "message":
-              {
-                "rid": roomid,
-                "msg": "",
-                "attachments": [{
-                  "title": this.capturedImageTitle,
-                  "title_link_download": false,
-                  "image_url": fileImage,
-                }],
-                "file":{
-                  "type": "application/img",
-                  "guid": guid.path,
-                  "image_url": fileImage
-                }
-              }
-            }
-            console.log('BODY TAKE PICTURE CHAT', body)
-            const loader = this.toastService.loading();
-            this.chatService.sendMessage(body).subscribe(res=> {
-              console.log(res);
-              loader.remove();
-            },(error) => {
-              loader.remove();
-              this.toastService.badRequest("Não foi possível adicionar a fotografia!");
-            });
-
-          });
-        }
-
-      });
-  }
-
-
-
-  async addCameraPictureToChat(roomId){
-
-    console.log('add camera to picture')
-
-    const image = await Camera.getPhoto({
-      quality: 50,
-      allowEditing: false,
-      resultType: CameraResultType.Uri,
-      source: CameraSource.Camera // Camera, Photos or Prompt!
-    });
-
-    if (image) {
-      await this.saveImage(image,roomId)
-    } else {
-      console.log('Error saving image')
-    }
-
-      //this.capturedImage = this.capturedImage;
-
+    return { capturedImage, capturedImageTitle}
 
   }
 
-  async addPictureToChatMobile(roomId) {
-
-    const capturedImage = await Camera.getPhoto({
-      quality: 50,
-      // allowEditing: true,
-      resultType: CameraResultType.Uri,
-      source: CameraSource.Photos
-
-    });
-
-    if (capturedImage) {
-      await this.saveImage(capturedImage,roomId)
-    }
 
 
-    /* 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';
-
-      //const loader = this.toastService.loading();
-
-      let body = {
-        "message":
-        {
-          "rid": roomId,
-          "msg": "",
-          "attachments": [{
-            //"title": this.capturedImageTitle ,
-            //"text": "description",
-            "title_link_download": false,
-            "image_url": this.capturedImage,
-          }]
-        }
-      }
-      this.chatService.sendMessage(body).subscribe(res=> {
-        //loader.remove();
-        //console.log(res);
-      },(error) => {
-        //loader.remove();
-      });
- */  }
-
-
- addPictureToChat(roomId) {
-
-  console.log('add picture to chat')
-
-  const input = this.fileLoaderService.createInput({
-    accept: ['image/apng', 'image/jpeg', 'image/png']
-  })
-
-  input.onchange = async () => {
-
-    //alert('Onchange AQUI')
-
-    const file = this.fileLoaderService.getFirstFile(input)
-
-    console.log('first file',file);
-
-
-    const formData = new FormData();
-    formData.append("blobFile", file);
-    let guid: any = await this.uploadFile(formData).toPromise()
-    console.log('ADD IMAGE FORM DATA', formData)
-    console.log('add picture to chat', guid.path);
-    this.downloadFile(guid.path).subscribe(async (event) => {
-
-      if (event.type === HttpEventType.DownloadProgress) {
-        //this.downloadProgess = Math.round((100 * event.loaded) / event.total);
-        //console.log('FILE TYPE 33', msg.file.type)
-      } else if (event.type === HttpEventType.Response) {
-        var fileImage = 'data:image/jpeg;base64,' + btoa(new Uint8Array(event.body).reduce((data, byte) => data + String.fromCharCode(byte), ''));
-        console.log('add picture to chat',fileImage);
-        await this.storage.set(guid.path, fileImage).then(() => {
-          console.log('add picture to chat IMAGE SAVED')
-
-          let body = {
-            "message":
-            {
-              "rid": roomId,
-              "msg": "",
-              "attachments": [{
-                //"title": this.capturedImageTitle ,
-                //"text": "description",
-                "title_link_download": false,
-                //"image_url": this.capturedImage,
-              }],
-              "file": {
-                "type": "application/img",
-                "guid": guid.path,
-                "image_url": fileImage
-              }
-            }
-          }
-
-          console.log('SELECT PICTURE GALLERY', body)
-          console.log(this.capturedImage)
-
-          this.chatService.sendMessage(body).subscribe(res => {
-
-            console.log('Msg after send image', res);
-          }, (error) => {
-            console.log('Msg after send image error', error);
-          });
-        });
-      }
-
-    });
-
-    /* const imageData =  await this.fileToBase64Service.convert(file)
-    this.capturedImage = imageData; */
-
-    //console.log(this.capturedImage)
-  };
-}
-
-  addDocumentToChat(roomId:string) {
+  getFileFromDevice(types: typeof FileType[]) {
     const input = this.fileLoaderService.createInput({
-      accept: ['.doc', '.docx', '.pdf']
+      accept: types
     })
 
-    input.onchange = async () => {
-      const loader = this.toastService.loading();
-      const file = this.fileLoaderService.getFirstFile(input)
+    return new Promise((resolve, reject)=>{
+      input.onchange = async () => {
+        const file = this.fileLoaderService.getFirstFile(input)
 
-      console.log(file);
+        resolve(file);
+      };
+    })
 
-      const formData = new FormData();
-      formData.append('file', file, file.name);
 
-      this.chatService.uploadFile(formData, roomId).subscribe(res=> {
-        console.log(res);
-        loader.remove();
-      },(error) => {
-        loader.remove();
-      });
-      //console.log(this.capturedImage)
-    };
   }
 
-  async addDocGestaoDocumentalToChat(roomId:string){
-    const modal = await this.modalController.create({
-      component: SearchPage,
-      cssClass: 'group-messages modal-desktop search-modal search-modal-to-desktop',
-      componentProps: {
-        type: 'AccoesPresidenciais & ArquivoDespachoElect',
-        select: true,
-        showSearchInput: true,
-      }
-    });
-    await modal.present();
-    modal.onDidDismiss().then(async res=>{
-      const data = res.data;
-
-      if(data.selected){
-        const loader = this.toastService.loading();
-
-        this.documents.push(data.selected);
-        console.log(res.data.selected);
-        console.log(res.data.selected.Id);
-        console.log(res.data.selected.ApplicationType);
-
-        let url = await this.processesService.GetDocumentUrl(res.data.selected.Id, res.data.selected.ApplicationType).toPromise();
-        let url_no_options: string = url.replace("webTRIX.Viewer","webTRIX.Viewer.Branch1");
-        console.log(url_no_options);
-
-        let body = {
-          "message":
-          {
-            "rid": roomId,
-            "msg": "",
-            "alias": "documento",
-            "attachments": [{
-              "title": res.data.selected.Assunto,
-              "description": res.data.selected.DocTypeDesc,
-              "title_link": url_no_options,
-              "title_link_download": true,
-              //"thumb_url": "assets/images/webtrix-logo.png",
-              "message_link": url_no_options,
-              "type": "webtrix"
-            }],
-            "file":{
-              "name": res.data.selected.Assunto,
-              "type": "application/webtrix",
-              "ApplicationId": res.data.selected.ApplicationType,
-              "DocId": res.data.selected.Id,
-              "Assunto": res.data.selected.Assunto,
-            }
-          }
-        }
-        this.chatService.sendMessage(body).subscribe(res=> {
-          loader.remove();
-          console.log(res);
-        },(error) => {
-          loader.remove();
-        });
-        loader.remove();
-      }
-    });
-  }
 
   viewDocumentByUrl(url) {
     const browser = this.iab.create(url,"_parent");
     browser.show();
   }
+
 }

src/app/services/processes.service.ts

@@ -1,6 +1,5 @@
 import { Injectable } from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
-import { AuthService } from '../services/auth.service';
 import { LoginUserRespose } from '../models/user.model';
 import { environment } from 'src/environments/environment';
 import { Observable } from 'rxjs';
@@ -10,7 +9,7 @@ import { ExpedienteFullTask } from '../models/Expediente';
 import { GetTasksListType } from '../models/GetTasksListType';
 import { fullTaskList } from '../models/dailyworktask.model';
 import { ChangeProfileService } from './change-profile.service';
-
+import { SessionStore } from '../store/session.service';
 @Injectable({
   providedIn: 'root'
 })
@@ -22,15 +21,14 @@ export class ProcessesService {
 
   constructor(
     private http: HttpClient,
-    public user: AuthService,
     private changeProfileService: ChangeProfileService
   ) {
 
-    this.loggeduser = this.user.ValidatedUser;
+    this.loggeduser = SessionStore.user;
 
     this.setHeader()
     this.changeProfileService.registerCallback(()=>{
-      this.loggeduser = this.user.ValidatedUser;
+      this.loggeduser = SessionStore.user;
       this.setHeader()
     })
 

src/app/services/sqlite.service.ts

@@ -127,7 +127,8 @@ export class SqliteService {
             DateEnd varchar(255),
             Detail varchar(255),
             Description varchar(255),
-            publications Text
+            publications Text,
+            publicationsDetails Text
           )`, [])
             .then((res) => {
               console.log("Sucess action Table created: ", res)
@@ -195,8 +196,8 @@ export class SqliteService {
   public addactions(data) {
     console.log('Action insert', data)
     this.dbInstance.executeSql(`
-    INSERT OR IGNORE INTO ${this.actions} (ActionType,DateBegin,DateEnd,Description,Detail,ProcessId,publications) 
-    VALUES ('${data.ActionType}','${data.DateBegin}', '${data.DateEnd}','${data.Description}','${data.Detail}','${data.ProcessId}','${data.publications}')`, [])
+    INSERT OR IGNORE INTO ${this.actions} (ActionType,DateBegin,DateEnd,Description,Detail,ProcessId,publications,publicationsDetails) 
+    VALUES ('${data.ActionType}','${data.DateBegin}', '${data.DateEnd}','${data.Description}','${data.Detail}','${data.ProcessId}','${data.publications}','${data.publicationsDetails}')`, [])
       .then(() => {
         console.log("action add with Success");
 
@@ -319,6 +320,22 @@ export class SqliteService {
 
   }
 
+  //updatePublicationsDetails
+  public updatePublicationsDetails(id, data) {
+    try {
+      console.log("update action data", data)
+      this.dbInstance.executeSql(`
+      UPDATE ${this.actions} SET publicationsDetails = ? WHERE ProcessId = ${id}`, [data])
+        .then(() => {
+          console.log("action update with Success");
+
+        }, (e) => {
+          console.log(JSON.stringify(e.err));
+        });
+    } catch(error) {}
+
+  }
+
   //updateChatMsg
   public updateChatMsg(id, data) {
     let jsonId = JSON.stringify(id)

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

@@ -78,7 +78,7 @@
             <div *ngIf="msg.attachments" class="message-attachments">
               <div *ngFor="let file of msg.attachments">
                 <div *ngIf="msg.file.type == 'application/img'" (click)="openPreview(msg)">
-                  <img *ngIf="file.image_url" src="{{file.image_url}}" alt="image">
+                  <img *ngIf="msg.file.image_url" src="{{msg.file.image_url}}" alt="image">
                   <ion-icon *ngIf="msg.file.image_url == null" name="download-outline"></ion-icon>
                 </div>
                 <div *ngIf="msg.file.type != 'application/img'">
@@ -97,7 +97,7 @@
                       <ion-label *ngIf="msg.file">
                         <span *ngIf="file.description">{{file.description}}</span>
                         <span *ngIf="file.description && msg.file.type != 'application/webtrix'"> • </span>
-                        <span *ngIf="msg.file.type != 'application/webtrix'">{{msg.file.type.replace('application/','').toUpperCase()}}</span>
+                        <span *ngIf="msg.file.type != 'application/webtrix'">{{msg.displayType}}</span>
                       </ion-label>
                   </div>
                 </div>
@@ -222,7 +222,7 @@
           <ion-fab-button title="Anexar Fotografia" (click)="addImage()" color="light">
             <ion-icon name="image"></ion-icon>
           </ion-fab-button>
-          <ion-fab-button title="Tirar Fotografia" class="hide-desktop" (click)="takePicture()" color="light">
+          <ion-fab-button title="Tirar Fotografia" (click)="takePicture()" color="light">
             <ion-icon name="camera"></ion-icon>
           </ion-fab-button>
           <ion-fab-button title="Documento da Gestão Documental" (click)="addFileWebtrix()" color="light">

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

@@ -26,6 +26,12 @@ import { HttpEventType } from '@angular/common/http';
 import { Storage } from '@ionic/storage';
 import { WsChatMethodsService } from 'src/app/services/chat/ws-chat-methods.service';
 import { MessageService } from 'src/app/services/chat/message.service';
+import { AttachmentsService } from 'src/app/services/attachments.service';
+
+import { CameraService } from 'src/app/services/camera.service';
+import { element } from 'protractor';
+import { FileType } from 'src/app/models/fileType';
+import { ToastService } from 'src/app/services/toast.service';
 
 /*
 import * as pdfjsLib from 'pdfjs-dist';
@@ -96,6 +102,10 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     public ThemeService: ThemeService,
     private changeDetectorRef: ChangeDetectorRef,
     private storage: Storage,
+    private AttachmentsService: AttachmentsService,
+    
+    private CameraService: CameraService,
+    private toastService: ToastService,
 
   ) {
     console.log('OnCONSTRUCTOR');
@@ -129,7 +139,6 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     setTimeout(() => {
       this.getRoomInfo();
     }, 1000);
-    this.setStatus('online');
     this.getChatMembers();
     //this.getMessageDB();
 
@@ -216,7 +225,6 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
   }
 
   ngOnDestroy() {
-    this.setStatus('away');
     window.removeEventListener('scroll', this.scrollChangeCallback, true);
   }
 
@@ -297,17 +305,8 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     }
   }
 
-  loadGroupMessages(roomId) {
-    this.showLoader = true;
-    this.chatService.getPrivateGroupMessages(this.roomId).subscribe(res => {
-      console.log(res);
-      let msgOnly = res['messages'].filter(data => data.t != 'au');
-      this.showLoader = false;
-    });
-  }
-
   sendMessage() {
-    this.wsChatMethodsService.getGroupRoom(this.roomId).send()
+    this.wsChatMethodsService.getGroupRoom(this.roomId).send({})
   }
 
   deleteMessage(msgId: string, room:any) {
@@ -388,10 +387,6 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
       else {
         this.roomName = res.data.name.split('-').join(' ');
         console.log(this.roomName);
-
-        //this.getRoomInfo();
-        this.loadGroupMessages(this.roomId);
-        //this.modalController.dismiss();
       };
 
     });
@@ -423,7 +418,6 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     popover.onDidDismiss().then(res => {
       console.log(res);
       if (res.data) {
-        this.loadGroupMessages(this.roomId);
         //this.getRoomInfo();
         //this.modalController.dismiss();
       };
@@ -464,89 +458,9 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
 
     modal.onDidDismiss().then(() => {
       //this.getRoomInfo();
-      this.loadGroupMessages(this.roomId)
     });
   }
 
-  loadPicture() {
-    const input = this.fileLoaderService.createInput({
-      accept: ['image/apng', 'image/jpeg', 'image/png']
-    })
-
-    input.onchange = async () => {
-      const file = this.fileLoaderService.getFirstFile(input)
-
-      console.log(file);
-
-      const imageData = await this.fileToBase64Service.convert(file)
-      this.capturedImage = imageData;
-      this.capturedImageTitle = file.name;
-
-      let body = {
-        "message":
-        {
-          "rid": this.roomId,
-          "msg": "",
-          "attachments": [{
-            //"title": this.capturedImageTitle ,
-            //"text": "description",
-            "title_link_download": false,
-            "image_url": this.capturedImage,
-          }]
-        }
-      }
-
-      this.chatService.sendMessage(body).subscribe(res => {
-        console.log(res);
-      }, (error) => {
-
-      });
-      //console.log(this.capturedImage)
-    };
-  }
-
-  loadDocument() {
-    const input = this.fileLoaderService.createInput({
-      accept: ['.doc', '.docx', '.pdf']
-    })
-
-    input.onchange = async () => {
-      const file = this.fileLoaderService.getFirstFile(input)
-
-      console.log(file);
-
-      const imageData = await this.fileToBase64Service.convert(file)
-      this.capturedImage = imageData;
-      this.capturedImageTitle = file.name;
-
-      let body = {
-        "message":
-        {
-          "rid": this.roomId,
-          "msg": "",
-          "attachments": [{
-            "title": this.capturedImageTitle,
-            "text": "",
-            "title_link": this.capturedImage,
-            "title_link_download": true,
-            "thumb_url": "https://static.ichimura.ed.jp/uploads/2017/10/pdf-icon.png",
-            "message_link": this.capturedImage,
-          }],
-          "file": {
-            "name": this.capturedImageTitle,
-            "type": "application/pdf",
-          }
-        }
-      }
-
-      this.chatService.sendMessage(body).subscribe(res => {
-        //console.log(res);
-      }, (error) => {
-
-      });
-      //console.log(this.capturedImage)
-    };
-  }
 
   async addDocGestaoDocumental() {
     const modal = await this.modalController.create({
@@ -563,36 +477,8 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
       if (res) {
         const data = res.data;
         this.documents.push(data.selected);
-        console.log(res.data.selected);
-        console.log(res.data.selected.Id);
-        console.log(res.data.selected.ApplicationType);
-
-        let url = await this.processesService.GetDocumentUrl(res.data.selected.Id, res.data.selected.ApplicationType).toPromise();
-        let url_no_options: string = url.replace("webTRIX.Viewer", "webTRIX.Viewer.Branch1");
-        console.log(url_no_options);
-        //console.log('Oie');
-
-        let body = {
-          "message":
-          {
-            "rid": this.roomId,
-            "msg": "",
-            "attachments": [{
-              "title": res.data.selected.Assunto,
-              "text": res.data.selected.DocTypeDesc,
-              "title_link": url_no_options,
-              "title_link_download": true,
-              "thumb_url": "https://static.ichimura.ed.jp/uploads/2017/10/pdf-icon.png",
-              "message_link": url_no_options,
-            }]
-          }
-        }
-        this.chatService.sendMessage(body).subscribe(res => {
-          console.log(res);
-        }, (error) => {
-
-        });
-
+        
+        this.addFileWebtrix()
       }
     });
   }
@@ -656,18 +542,119 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
     await modal.present();
   }
 
-  takePicture() {
-    this.fileService.addCameraPictureToChat(this.roomId);
+  async takePicture() {
+    const roomId = this.roomId
+    
+    const image = await this.CameraService.takePicture();
+    await this.fileService.saveImage(image)
+    const lastphoto: any = await this.fileService.loadFiles();
+    const { capturedImage, capturedImageTitle} = await this.fileService.loadFileData(lastphoto);
+
+    const base64 = await fetch(capturedImage);
+    const blob = await base64.blob();
+    const formData = new FormData();
+    formData.append("blobFile", blob);
+
+    this.wsChatMethodsService.getDmRoom(roomId).send({
+      file: {
+        "type": "application/img",
+        "guid": '',
+        "image_url": capturedImage
+      },
+      attachments: [{
+        "title": capturedImageTitle ,
+        "image_url": capturedImage,
+        "text": "description",
+        "title_link_download": false,
+      }],
+      temporaryData: formData
+    })
+
   }
-  addImage() {
-    this.fileService.addPictureToChat(this.roomId);
+  
+  async addImage() {
+    this.addFileToChat(['image/apng', 'image/jpeg', 'image/png'])
   }
-  addFile() {
-    this.fileService.addDocumentToChat(this.roomId);
+  
+  async addFile() {
+    this.addFileToChat(['.doc', '.docx', '.pdf'])
   }
-  addFileWebtrix() {
-    this.fileService.addDocGestaoDocumentalToChat(this.roomId);
+
+  async addFileWebtrix() {
+    const roomId = this.roomId
+
+    const modal = await this.modalController.create({
+      component: SearchPage,
+      cssClass: 'group-messages modal-desktop search-modal search-modal-to-desktop',
+      componentProps: {
+        type: 'AccoesPresidenciais & ArquivoDespachoElect',
+        select: true,
+        showSearchInput: true,
+      }
+    });
+    await modal.present();
+    modal.onDidDismiss().then(async res=>{
+      const data = res.data;
+
+      if(data.selected) {
+        const loader = this.toastService.loading();
+
+        this.wsChatMethodsService.getDmRoom(roomId).send({
+          file:{
+            "name": res.data.selected.Assunto,
+            "type": "application/webtrix",
+            "ApplicationId": res.data.selected.ApplicationType,
+            "DocId": res.data.selected.Id,
+            "Assunto": res.data.selected.Assunto,
+          },
+          attachments: [{
+            "title": res.data.selected.Assunto,
+            "description": res.data.selected.DocTypeDesc,
+            // "title_link": url_no_options,
+            "title_link_download": true,
+            //"thumb_url": "assets/images/webtrix-logo.png",
+            // "message_link": url_no_options,
+            "type": "webtrix",
+            //"thumb_url": "assets/images/webtrix-logo.png",
+            "text": res.data.selected.DocTypeDesc,
+            "thumb_url": "https://static.ichimura.ed.jp/uploads/2017/10/pdf-icon.png",
+          }],
+          temporaryData: res
+        })
+
+        loader.remove();
+
+      }
+    });
   }
+
+
+
+  async addFileToChat(types: typeof FileType[] ) {
+    const roomId = this.roomId
+    
+    const file: any = await this.fileService.getFileFromDevice(types);
+    const imageData =  await this.fileToBase64Service.convert(file)
+
+    const formData = new FormData();
+    formData.append("blobFile", file);
+    
+    this.wsChatMethodsService.getDmRoom(roomId).send({
+      file: {
+        "type": "application/img",
+        "guid": '',
+        "image_url": imageData
+      },
+      temporaryData: formData,
+      attachments: [{
+        "title": file.name ,
+        "image_url": imageData,
+        "text": "description",
+        "title_link_download": false,
+      }]
+    })
+  }
+
   bookMeeting() {
     let data = {
       roomId: this.roomId,
@@ -693,7 +680,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
       return this.animationController.create()
         .addElement(baseEl)
         .easing('ease-out')
-        .duration(5000)
+        .duration(500)
         .addAnimation([backdropAnimation, wrapperAnimation]);
     }
 
@@ -711,10 +698,11 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
         members: this.members,
       }
     });
-
     await modal.present();
-    modal.onDidDismiss().then((res) => {
-      //console.log(res['data']);
+    modal.onDidDismiss().then( async (res) => {
+      console.log(res['data']);
+      const roomId = this.roomId;
+
       if (res['data'] == 'meeting') {
         //this.closeAllDesktopComponents.emit();
         let data = {
@@ -724,73 +712,36 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
         this.openNewEventPage.emit(data);
       }
       else if (res['data'] == 'take-picture') {
-        this.fileService.addCameraPictureToChat(this.roomId);
-        //this.loadPicture();
+
+        this.takePicture()
+
       }
       else if (res['data'] == 'add-picture') {
-        this.fileService.addPictureToChat(this.roomId);
-        //this.loadPicture();
+
+        this.addImage()
+
       }
       else if (res['data'] == 'add-document') {
-        this.loadDocument();
+
+        this.addFile()
+
       }
       else if (res['data'] == 'documentoGestaoDocumental') {
-        this.fileService.addDocGestaoDocumentalToChat(this.roomId);
-        //this.addDocGestaoDocumental();
+
+        this.addFileWebtrix()
+        
+        this.showLoader = false;
       }
-      this.loadGroupMessages(this.roomId);
 
     });
   }
 
 
-  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;
-  }
-
   downloadFileMsg(msg: MessageService) {
     console.log('FILE TYPE', msg.file.type)
     this.downloadFile = "";
     if (msg.file.type == "application/img") {
-      this.fileService.downloadFile(msg.file.guid).subscribe(async (event) => {
+      this.AttachmentsService.downloadFile(msg.file.guid).subscribe(async (event) => {
         console.log('FILE TYPE 22', msg.file.guid)
         var name = msg.file.guid;
 

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

@@ -48,11 +48,11 @@
           </mat-menu>
         </div>
         <div class="title">
-          <ion-label>{{msg.u.name}}</ion-label>
+          <ion-label>{{msg.u.name}} {{msg.offline}}</ion-label>
           <span class="time">{{showDateDuration(msg._updatedAt)}}</span>
         </div>
         <div>
-          <ion-label>{{msg.msg}}</ion-label>
+          <ion-label>{{msg.msg}} {{msg.offline}}</ion-label>
           {{last ? scrollToBottom() : ''}}
         </div>
       </div>
@@ -67,7 +67,7 @@
             </mat-menu>
           </div>
           <div class="title">
-            <ion-label>{{msg.u.name}}</ion-label>
+            <ion-label>{{msg.u.name}} </ion-label>
             <span class="time">{{showDateDuration(msg.duration)}}</span>
           </div>
           <div>
@@ -97,7 +97,7 @@
                       <span *ngIf="file.description">{{file.description}}</span>
                       <span *ngIf="file.description && msg.file.type != 'application/webtrix'"> • </span>
                       <span
-                        *ngIf="msg.file.type != 'application/webtrix'">{{msg.file.type.replace('application/','').toUpperCase()}}</span>
+                        *ngIf="msg.file.type != 'application/webtrix'">{{msg.displayType}}</span>
                     </ion-label>
                   </div>
                 </div>

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

@@ -13,10 +13,9 @@ import { ChatMessageStore } from 'src/app/store/chat/chat-message.service';
 import { ChatUserStorage } from 'src/app/store/chat/chat-user.service';
 import { TimeService } from 'src/app/services/functions/time.service';
 import { FileService } from 'src/app/services/functions/file.service';
-import { HttpClient, HttpEventType, HttpHeaders } from '@angular/common/http';
+import { HttpClient, HttpEventType } from '@angular/common/http';
 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';
 import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
 import { SqliteService } from 'src/app/services/sqlite.service';
 import { StorageService } from 'src/app/services/storage.service';
@@ -26,7 +25,13 @@ import { Storage } from '@ionic/storage';
 import { WsChatMethodsService } from 'src/app/services/chat/ws-chat-methods.service'
 import { WsChatService } from 'src/app/services/chat/ws-chat.service'
 import { MessageService } from 'src/app/services/chat/message.service';
-import { element } from 'protractor';
+import { AttachmentsService } from 'src/app/services/attachments.service';
+
+import { CameraService } from 'src/app/services/camera.service';
+import { FileType } from 'src/app/models/fileType';
+import { SearchPage } from 'src/app/pages/search/search.page';
+import { ProcessesService } from 'src/app/services/processes.service';
+import { FileToBase64Service } from 'src/app/services/file/file-to-base64.service';
 
 const IMAGE_DIR = 'stored-images';
 @Component({
@@ -92,7 +97,12 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     private router: Router,
     private storage: Storage,
     public wsChatMethodsService: WsChatMethodsService,
-    public WsChatService: WsChatService
+    public WsChatService: WsChatService,
+    private AttachmentsService: AttachmentsService,
+    
+    private CameraService: CameraService,
+    private processesService: ProcessesService,
+    private fileToBase64Service: FileToBase64Service,
   ) {
 
     this.loggedUser = authService.ValidatedUserChat['data'];
@@ -104,6 +114,11 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     this.wsChatMethodsService.getDmRoom(this.roomId).scrollDown = this.scrollToBottomClicked
 
     this.wsChatMethodsService.openRoom(this.roomId)
+
+    this.wsChatMethodsService.getDmRoom(this.roomId).uploadAttachment = async (formData) => {
+      let guid: any = await this.AttachmentsService.uploadFile(formData).toPromise()
+    }
+
     setTimeout(() => {
       this.scrollToBottomClicked()
     }, 150)
@@ -113,7 +128,8 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
 
   ngOnInit() {
     this.scrollToBottom();
-    this.setStatus('online');
+
+    this.getChatMembers();
 
   }
 
@@ -133,15 +149,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     });
   }
 
-  setStatus(status: string) {
-    let body = {
-      message: '',
-      status: status,
-    }
-    this.chatService.setUserStatus(body).subscribe(res => {
-      console.log(res);
-    })
-  }
 
   notImplemented() {
     this.alertService.presentAlert('Funcionalidade em desenvolvimento');
@@ -149,7 +156,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
 
   load = () => {
     this.checktimeOut = true;
-    this.serverLongPull();
     this.getChatMembers();
   }
 
@@ -204,7 +210,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
 
   ngOnDestroy() {
     this.checktimeOut = false;
-    this.setStatus('away');
     window.removeEventListener('scroll', this.scrollChangeCallback, true);
   }
 
@@ -241,7 +246,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
   }
 
   sendMessage() {
-    this.wsChatMethodsService.getDmRoom(this.roomId).send()
+    this.wsChatMethodsService.getDmRoom(this.roomId).send({})
   }
 
   deleteMessage(msgId: string, room:any) {
@@ -250,7 +255,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
 
   async viewDocument(msg: any, url?: string) {
     if (msg.file.type == "application/img") {
-      let response: any = await this.fileService.getFile(msg.file.guid).toPromise();
+      let response: any = await this.AttachmentsService.getFile(msg.file.guid).toPromise();
       console.log(response);
       alert(response);
 
@@ -266,7 +271,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
       //fullUrl = "http://www.africau.edu/images/default/sample.pdf";
 
       this.frameUrl = fullUrl;
-      //this.fileService.viewDocumentByUrl(fullUrl);
+
       this.chatService.getDocumentDetails(fullUrl);
     }
   }
@@ -438,22 +443,118 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
 
 
 
-  takePicture() {
+  async takePicture() {
     const roomId = this.roomId
-    this.fileService.addCameraPictureToChat(roomId);
+    
+    const image = await this.CameraService.takePicture();
+    await this.fileService.saveImage(image)
+    const lastphoto: any = await this.fileService.loadFiles();
+    const { capturedImage, capturedImageTitle} = await this.fileService.loadFileData(lastphoto);
+    const base64 = await fetch(capturedImage);
+    const blob = await base64.blob();
+    const formData = new FormData();
+    formData.append("blobFile", blob);
+
+    console.log('formData', formData)
+
+    this.wsChatMethodsService.getDmRoom(roomId).send({
+      file: {
+        "type": "application/img",
+        "guid": '',
+        "image_url": capturedImage
+      },
+      temporaryData: formData,
+      attachments: [{
+        "title": capturedImageTitle ,
+        "image_url": capturedImage,
+        "text": "description",
+        "title_link_download": false,
+      }]
+    })
+
   }
-  addImage() {
-    const roomId = this.roomId;
-    this.fileService.addPictureToChat(roomId);
-    //this.fileService.loadPicture();
-    //this.fileService.addPictureToChat(roomId);
+  
+  async addImage() {
+    this.addFileToChat(['image/apng', 'image/jpeg', 'image/png'])
   }
-  addFile() {
-    this.fileService.addDocumentToChat(this.roomId);
+  
+  async addFile() {
+    this.addFileToChat(['.doc', '.docx', '.pdf'])
   }
-  addFileWebtrix() {
-    this.fileService.addDocGestaoDocumentalToChat(this.roomId);
+
+  async addFileWebtrix() {
+    const modal = await this.modalController.create({
+      component: SearchPage,
+      cssClass: 'group-messages modal-desktop search-modal search-modal-to-desktop',
+      componentProps: {
+        type: 'AccoesPresidenciais & ArquivoDespachoElect',
+        select: true,
+        showSearchInput: true,
+      }
+    });
+    await modal.present();
+    modal.onDidDismiss().then(async res=>{
+      const data = res.data;
+      const roomId = this.roomId
+
+      if(data.selected) {
+        const loader = this.toastService.loading();
+
+        this.wsChatMethodsService.getDmRoom(roomId).send({
+          file:{
+            "name": res.data.selected.Assunto,
+            "type": "application/webtrix",
+            "ApplicationId": res.data.selected.ApplicationType,
+            "DocId": res.data.selected.Id,
+            "Assunto": res.data.selected.Assunto,
+          },
+          attachments: [{
+            "title": res.data.selected.Assunto,
+            "description": res.data.selected.DocTypeDesc,
+            "title_link_download": true,
+            "type": "webtrix",
+            "text": res.data.selected.DocTypeDesc,
+            "thumb_url": "https://static.ichimura.ed.jp/uploads/2017/10/pdf-icon.png",
+          }],
+        })
+
+        loader.remove();
+
+      }
+    });
   }
+
+
+
+  async addFileToChat(types: typeof FileType[] ) {
+    const roomId = this.roomId
+
+    const file: any = await this.fileService.getFileFromDevice(types);
+    const imageData =  await this.fileToBase64Service.convert(file)
+
+    const formData = new FormData();
+    formData.append("blobFile", file);
+    
+    this.wsChatMethodsService.getDmRoom(roomId).send({
+      file: {
+        "type": "application/img",
+        "guid": '',
+        "image_url": imageData, // GPR
+      },
+      attachments: [{
+        "title": file.name ,
+        "name": file.name ,
+        // "text": "description",
+        "image_url": imageData, // rocketchat
+        "title_link_download": false,
+      }],
+      temporaryData: formData
+    })
+
+
+  }
+  
+
   bookMeeting() {
     let data = {
       roomId: this.roomId,
@@ -463,7 +564,13 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
   }
 
 
+  chatsend() {
+
+  }
+
   async _openChatOptions() {
+    const roomId = this.roomId;
+
 
     const enterAnimation = (baseEl: any) => {
       const backdropAnimation = this.animationController.create()
@@ -499,8 +606,10 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
       }
     });
     await modal.present();
-    modal.onDidDismiss().then((res) => {
+    modal.onDidDismiss().then( async (res) => {
       console.log(res['data']);
+      
+
       if (res['data'] == 'meeting') {
         //this.closeAllDesktopComponents.emit();
         let data = {
@@ -510,111 +619,38 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
         this.openNewEventPage.emit(data);
       }
       else if (res['data'] == 'take-picture') {
-        this.fileService.addCameraPictureToChat(this.roomId);
-        //this.loadPicture();
+
+        this.takePicture()
+
       }
       else if (res['data'] == 'add-picture') {
-        this.fileService.addPictureToChat(this.roomId);
-        //this.loadPicture();
+
+        this.addImage()
+
       }
       else if (res['data'] == 'add-document') {
-        this.fileService.addDocumentToChat(this.roomId);
-        //this.loadDocument();
+
+        this.addFile()
+
       }
       else if (res['data'] == 'documentoGestaoDocumental') {
 
-        this.fileService.addDocGestaoDocumentalToChat(this.roomId);
+        this.addFileWebtrix()
+        
         this.showLoader = false;
-        //this.addDocGestaoDocumental();
       }
 
     });
   }
 
-  async serverLongPull() {
-
-    const roomId = this.roomId;
-
-    this.chatService.getRoomMessages(this.roomId).subscribe(async res => {
-      console.log('serverLongPull', res['success']);
 
 
-      if (res['success'] == true) {
-        // Show Error
-        //showMessage(response.statusText);
-        /* this.messages = res['messages'].reverse();
-        this.chatMessageStore.add(roomId, this.messages) */
-        console.log('MSG FROM ROCKET ', res['messages'].reverse())
-        /* this.transformData(res['messages'].reverse());
-        this.getMessageDB(); */
-
-        //console.log(this.messages);
-        // Reconnect in one second
-        if (this.route.url != "/home/chat") {
-          console.log("Timer message stop")
-        }
-        else {
-          if (document.querySelector('app-messages')) {
-            await new Promise(resolve => setTimeout(resolve, 5000));
-            // await this.serverLongPull();
-            this.getDirectMessages.emit();
-            console.log('Timer message running')
-          }
-        }
-      }
-    }, (error) => {
-      console.log(error);
-    });
-
-  }
-
-  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;
-  }
 
   downloadFileMsg(msg: MessageService) {
     console.log('FILE TYPE', msg.file.type)
     this.downloadFile = "";
     if (msg.file.type == "application/img") {
-      this.fileService.downloadFile(msg.file.guid).subscribe(async (event) => {
+      this.AttachmentsService.downloadFile(msg.file.guid).subscribe(async (event) => {
         console.log('FILE TYPE 22', msg.file.guid)
         var name = msg.file.guid;
 

src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.html

@@ -28,12 +28,12 @@
 
     <div *ngSwitchCase="'MDGPR'" class="height-100">
 
-      <div *ngIf="eventaprovacaostore.listmd.length != 0">
+      <div *ngIf="eventsMDGPRList.length != 0">
 
         <ion-list class="width-100"  >
           <div
             class="expediente item-hover ion-no-padding ion-no-margin cursor-pointer"
-            *ngFor="let event of eventaprovacaostore.listmd"
+            *ngFor="let event of eventsMDGPRList"
             (click)="goToEventDetail(event)"
           >
             <!-- (click)="openApproveModal(event)" -->
@@ -52,7 +52,7 @@
         </ion-list>
       </div>
 
-      <div  *ngIf="eventaprovacaostore.listmd.length == 0" class="centered-div">
+      <div  *ngIf="eventsMDGPRList.length == 0" class="centered-div">
         <div *ngSwitchCase="'MDGPR'" >
           <div class="d-flex height-90 align-center justify-content-center"
             >
@@ -62,12 +62,12 @@
       </div>
   </div>
   <div *ngSwitchCase="'PR'">
-    <div *ngIf="eventaprovacaostore.listpr.length != 0">
+    <div *ngIf="eventsPRList.length != 0">
       <ion-list class="width-100" *ngSwitchCase="'PR'">
-        <div class="width-100" *ngIf="eventaprovacaostore.listpr">
+        <div class="width-100" *ngIf="eventsPRList">
           <div
             class="expediente item-hover ion-no-padding ion-no-margin cursor-pointer"
-            *ngFor="let event of eventaprovacaostore.listpr"
+            *ngFor="let event of eventsPRList"
             (click)="goToEventDetail(event)"
           >
             <div class="item event-pr-{{event.workflowInstanceDataFields.Agenda}} width-100">
@@ -87,10 +87,10 @@
 
     </div>
 
-    <div  *ngIf="eventaprovacaostore.listpr.length == 0" class="centered-div d-flex height-90 align-center justify-content-center">
+    <div  *ngIf="eventsPRList.length == 0" class="centered-div d-flex height-90 align-center justify-content-center">
       <div *ngSwitchCase="'PR'" >
         <div class="d-flex align-center justify-content-center"
-          *ngIf="eventaprovacaostore.listpr.length < 1">
+          *ngIf="eventsPRList.length < 1">
           Lista vazia
         </div>
       </div>

src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts

@@ -8,6 +8,7 @@ import { LoginUserRespose } from 'src/app/models/user.model';
 import { AuthService } from 'src/app/services/auth.service';
 import { EventoAprovacaoStore } from 'src/app/store/eventoaprovacao-store.service';
 import { SortService } from 'src/app/services/functions/sort.service';
+import { Storage } from '@ionic/storage';
 
 @Component({
   selector: 'app-events-to-approve',
@@ -33,6 +34,7 @@ export class EventsToApprovePage implements OnInit {
     private router: Router,
     private userAuth: AuthService,
     private sortService: SortService,
+    private storage: Storage
     )
     {
       this.loggeduser = userAuth.ValidatedUser;
@@ -63,25 +65,46 @@ export class EventsToApprovePage implements OnInit {
   async LoadToApproveEvents() {
     this.showLoader = true;
     console.log(this.segment);
+    this.getFromDB();
     if(this.segment == 'MDGPR'){
       let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR', false).toPromise();
       let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
       this.eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);
+      this.eventsMDGPRList = this.sortService.sortArrayByDate(this.eventsMDGPRList)
       console.log(this.sortService.sortArrayByDate(this.eventsMDGPRList));
 
-      this.eventaprovacaostore.resetmd(this.sortService.sortDate(this.eventsMDGPRList, 'CreateDate'));
+      this.storage.set('event-to-aproveMD',this.eventsMDGPRList).then(() => {
+        console.log(' EVENTMD TO APROVE SAVED')
+      })
+
+      //this.eventaprovacaostore.resetmd(this.sortService.sortDate(this.eventsMDGPRList, 'CreateDate'));
     }
     else if(this.segment == 'PR'){
       let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR', false).toPromise();
       let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise();
       this.eventsPRList = prEventsOficial.concat(prEventsPessoal);
+      this.eventsPRList = this.sortService.sortArrayByDate(this.eventsPRList)
       
-      this.eventaprovacaostore.resetpr(this.sortService.sortDate(this.eventsPRList, 'CreateDate'));
+      this.storage.set('event-to-aprovePR',this.eventsPRList).then(() => {
+        console.log(' EVENTPR TO APROVE SAVED')
+      })
+      //this.eventaprovacaostore.resetpr(this.sortService.sortDate(this.eventsPRList, 'CreateDate'));
     }
     this.showLoader = false;
   }
 
 
+  getFromDB() {
+    this.storage.get('event-to-aproveMD').then((events) => {
+      this.eventsMDGPRList = events
+    })
+
+    this.storage.get('event-to-aprovePR').then((events) => {
+      this.eventsPRList = events
+    })
+  }
+
+
   toDateString(e) {
     return new Date(e).toDateString()
   }

src/app/shared/gabinete-digital/expedients/expedients.page.html

@@ -22,10 +22,10 @@
   <div class="content width-100 overflow-y-auto height-100" >
     <div >
 
-      <ion-list *ngIf="expedientegbstore.list.length >=0">
+      <ion-list *ngIf="taskslist.length >=0">
         <div
           class="expediente item-hover ion-no-padding ion-no-margin cursor-pointer"
-          *ngFor = "let task of expedientegbstore.list"
+          *ngFor = "let task of taskslist"
           (click)="goToExpediente(task.SerialNumber)"
         >
           <div class="item width-100">
@@ -58,13 +58,13 @@
     </div>
 
     <div
-      *ngIf="!skeletonLoader && expedientegbstore.list.length == 0 && expedientegbstore.list.length == 0"
+      *ngIf="!skeletonLoader && taskslist.length == 0 && taskslist.length == 0"
       class="empty-list d-flex height-100 align-center justify-content-center"
     >
       <span>Lista vazia</span>
     </div>
 
-    <div *ngIf="skeletonLoader && expedientegbstore.list.length == 0">
+    <div *ngIf="skeletonLoader && taskslist.length == 0">
 
       <ion-list>
         <ion-item>

src/app/shared/gabinete-digital/expedients/expedients.page.ts

@@ -6,6 +6,7 @@ import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service';
 import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe';
 import { ThemeService } from 'src/app/services/theme.service'
 import { SortService } from 'src/app/services/functions/sort.service';
+import { Storage } from '@ionic/storage';
 
 @Component({
   selector: 'app-expedients',
@@ -13,27 +14,28 @@ import { SortService } from 'src/app/services/functions/sort.service';
   styleUrls: ['./expedients.page.scss'],
 })
 export class ExpedientsPage implements OnInit {
-  segment:string;
+  segment: string;
 
   taskslist = [];
-  serialNumber:string;
+  serialNumber: string;
 
-  @Input() profile:string;
+  @Input() profile: string;
   skeletonLoader = true
   expedientegbstore = ExpedienteGdStore
 
   expedienteTaskPipe = new ExpedienteTaskPipe()
 
   constructor(
-    private processes:ProcessesService,
+    private processes: ProcessesService,
     private alertService: AlertService,
     private router: Router,
     public ThemeService: ThemeService,
     private sortService: SortService,
-    ) {
-      this.profile = 'mdgpr';
+    private storage: Storage
+  ) {
+    this.profile = 'mdgpr';
 
-    }
+  }
 
   ngOnInit() {
     //Inicializar segment
@@ -43,11 +45,11 @@ export class ExpedientsPage implements OnInit {
     this.router.events.forEach((event) => {
       if (event instanceof NavigationStart &&
         event.url.startsWith('/home/gabinete-digital?expedientes=true')) {
-          if(window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {
-            this.doRefresh()
-          } else {
-            this.LoadList()
-          }
+        if (window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) {
+          this.doRefresh()
+        } else {
+          this.LoadList()
+        }
       }
     });
 
@@ -75,21 +77,35 @@ export class ExpedientsPage implements OnInit {
         this.taskslist.push(task);
 
       });
-
       this.taskslist = this.sortService.sortDate(this.taskslist, 'CreateDate')
+      this.addProcessTODb(this.taskslist);
       this.expedientegbstore.reset(this.taskslist);
+    }, (error) => {
+      this.getEventsFromLocalDb();
     });
   }
 
-  doRefresh() {
-    setTimeout(()=>{
-      this.LoadList();
-    }, 1000)
-
+  addProcessTODb(task) {
+    this.storage.set('gabinete-expediente', task).then(() => {
+      console.log('GABINETE EXPEDIENTE SAVED')
+    })
   }
 
-  goToExpediente(serialNumber:any){
-    this.router.navigate(['/home/gabinete-digital/expediente',serialNumber,'gabinete-digital']);
+  getEventsFromLocalDb() {
+    this.storage.get('gabinete-expediente').then((expediente) => {
+      this.taskslist = expediente
+    })
   }
 
-}
+    doRefresh() {
+      setTimeout(() => {
+        this.LoadList();
+      }, 1000)
+
+    }
+
+    goToExpediente(serialNumber: any) {
+      this.router.navigate(['/home/gabinete-digital/expediente', serialNumber, 'gabinete-digital']);
+    }
+
+  }

src/app/shared/gabinete-digital/pendentes/pendentes.page.html

@@ -20,7 +20,7 @@
   </ion-refresher>
 
   <app-task-list
-    [taskList] = pendentesstore.list
+    [taskList] = listToPresent
     [skeletonLoader] = skeletonLoader
     (viewTaskDetail)="viewTaskDetails($event)"
   > </app-task-list>

src/app/shared/gabinete-digital/pendentes/pendentes.page.ts

@@ -8,6 +8,7 @@ import { PendentesStore } from 'src/app/store/pendestes-store.service';
 import { LoginUserRespose } from 'src/app/models/user.model';
 import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
 import { SortService } from 'src/app/services/functions/sort.service';
+import { Storage } from '@ionic/storage';
 
 @Component({
   selector: 'app-pendentes',
@@ -20,6 +21,7 @@ export class PendentesPage implements OnInit {
   pendentesstore = PendentesStore;
   customTaskPipe = new CustomTaskPipe()
   loggeduser: LoginUserRespose;
+  listToPresent = [];
 
   @Input() profile:string;
   segment:string;
@@ -30,6 +32,7 @@ export class PendentesPage implements OnInit {
     private authService: AuthService,
     private router: Router,
     private sortService: SortService,
+    private storage: Storage
     ) {
       this.loggeduser = authService.ValidatedUser;
     }
@@ -52,7 +55,7 @@ export class PendentesPage implements OnInit {
 
   async LoadList(){
     this.skeletonLoader = true;
-
+    this.processes.GetPendingTasks(false).subscribe(async res => {
     let pendentes = await this.processes.GetPendingTasks(false).toPromise();
     let pendentesList = [];
 
@@ -64,9 +67,24 @@ export class PendentesPage implements OnInit {
     pendentesList = removeDuplicate( pendentesList)
     pendentesList = this.sortService.sortDate(pendentesList, 'CreateDate')
 
+    this.listToPresent = pendentesList
     this.pendentesstore.reset(pendentesList);
+    this.storage.set('pendente-list',pendentesList).then(() => {
+      console.log('Pendente list SAVED')
+    })
     this.skeletonLoader = false;
-  }
+  }, (error) => {
+    if(error.status == 0){
+      this.getFromDb();
+    }
+  })
+}
+
+getFromDb() {
+    this.storage.get('pendente-list').then((pendentes) => {
+      this.listToPresent =pendentes
+    })
+}
 
   doRefresh() {
     setTimeout(()=>{

src/app/shared/popover/chat-options-popover/chat-options-popover.page.html

@@ -8,7 +8,7 @@
   <div class="buttons">
     <button  (click)="takePicture()" full class="btn-ok" shape="round" >Tirar Fotografia</button>
     <button hidden (click)="addFile()" class="btn-ok" shape="round" >Anexar Documento</button>
-    <button hidden (click)="anexarFoto()" full class="btn-ok" shape="round" >Anexar Fotografia</button>
+    <button (click)="anexarFoto()" full class="btn-ok" shape="round" >Anexar Fotografia</button>
     <button (click)="addDocGestaoDocumental()" class="btn-ok" shape="round" >Gestão Documental</button>
     <div class="solid"></div>
     <button (click)="bookMeeting()" class="btn-ok" shape="round" >Novo Evento</button>

src/app/shared/shared.module.ts

@@ -2,6 +2,7 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
 import { IonicModule } from '@ionic/angular';
+import { IonicImageLoaderModule } from 'ionic-image-loader-v5';
 // import { HeaderPage } from './header/header.page';
 // import { HeaderPrPage } from './header-pr/header-pr.page';
 // import { BtnSeguintePage } from './btn-seguinte/btn-seguinte.page';
@@ -17,7 +18,8 @@ import { IonicModule } from '@ionic/angular';
   imports: [
     CommonModule,
     FormsModule,
-    IonicModule
+    IonicModule,
+    IonicImageLoaderModule
   ],
   exports: [
     // HeaderPage,