merge made

src/app/shared/agenda/approve-event/approve-event.page.ts

@@ -2,7 +2,6 @@ import { Component, OnInit, Input, EventEmitter, Output } from '@angular/core';
 import { NavigationExtras, Router } from '@angular/router';
 import { ModalController, PopoverController } from '@ionic/angular';
 import { Event } from 'src/app/models/event.model';
-import { AlertService } from 'src/app/services/alert.service';
 import { AttachmentsService } from 'src/app/services/attachments.service';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { EmendMessageModalPage } from 'src/app/pages/agenda/emend-message-modal/emend-message-modal.page';
@@ -47,7 +46,6 @@ export class ApproveEventPage implements OnInit {
     private processes:ProcessesService,
     private attachmentsService: AttachmentsService,
     private popoverController: PopoverController,
-    private alertService: AlertService,
     private iab: InAppBrowser,
     private toastService: ToastService,
     public ThemeService: ThemeService
@@ -81,10 +79,6 @@ export class ApproveEventPage implements OnInit {
 
   } */
 
-  notImplemented() {
-    this.alertService.presentAlert('Funcionalidade em desenvolvimento');
-  }
-
   close() {
     /* this.router.navigate(['/home/gabinete-digital/event-list']); */
     this.closeEventToApprove.emit();

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

@@ -48,11 +48,16 @@
           </mat-menu>
         </div>
         <div class="title">
-          <ion-label>{{msg.u.name}}</ion-label>
+          <ion-label (click)="testEditMessage(msg)">{{msg.u.name}}</ion-label>
           <span class="time">{{msg.duration}}</span>
         </div>
-        <div>
-          <ion-label>{{msg.msg}}</ion-label>
+        <div class="d-flex justify-space-between">
+          <ion-label class="flex-0">{{msg.msg}}</ion-label> 
+          <ion-label class="float-status-all float-status" >
+            <ion-icon *ngIf="!msg.offline && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon>
+            <ion-icon *ngIf="msg.offline && msg.viewed.length == 0" src="assets/images/check-solid.svg"></ion-icon>
+            <ion-icon *ngIf="msg.viewed.length == 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon>
+          </ion-label>
           {{last ? scrollToBottom() : ''}}
         </div>
       </div>
@@ -75,6 +80,11 @@
               <div *ngFor="let file of msg.attachments">
                 <div *ngIf="msg.file.type == 'application/img'" (click)="openPreview(msg)" dfsdvsvs>
                   <img src={{msg.attachments[0].image_url}} alt="image">
+                  <ion-label class="float-status-image float-status-all">
+                    <ion-icon *ngIf="!msg.offline && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon>
+                    <ion-icon *ngIf="msg.offline && msg.viewed.length == 0" src="assets/images/check-solid.svg"></ion-icon>
+                    <ion-icon *ngIf="msg.viewed.length == 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon>
+                  </ion-label>
                 </div>
                 <div *ngIf="msg.file.type != 'application/img'">
                   <div class="file">
@@ -99,6 +109,11 @@
                       <span
                         *ngIf="msg.file.type != 'application/webtrix'">{{msg.displayType}}</span>
                     </ion-label>
+                    <ion-label class="float-status-webtrix float-status-all">
+                      <ion-icon *ngIf="!msg.offline && msg.viewed.length == 0" src="assets/images/check-double-solid.svg"></ion-icon>
+                      <ion-icon *ngIf="msg.offline && msg.viewed.length == 0" src="assets/images/check-solid.svg"></ion-icon>
+                      <ion-icon *ngIf="msg.viewed.length == 1" src="assets/images/check-double-solid -viewed.svg"></ion-icon>
+                    </ion-label>
                   </div>
                 </div>
               </div>

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

@@ -287,3 +287,29 @@ display: block;
  padding-left: 10px;
 }
 
+.float-status{
+  position: relative !important;
+  float: right;
+  display: flex;
+  align-items: self-end;
+}
+
+.float-status-image{
+  position: relative !important;
+  float: right;
+  display: flex;
+  align-items: self-end;
+  top: -15px;
+}
+
+.float-status-webtrix {
+  position: relative !important;
+  top: 0px !important;
+  float: right;
+  display: flex;
+  align-items: self-end;
+}
+
+.float-status-all {
+  font-size: 10pt !important;
+}

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

@@ -150,11 +150,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
     });
   }
 
-
-  notImplemented() {
-    this.alertService.presentAlert('Funcionalidade em desenvolvimento');
-  }
-
   load = () => {
     this.checktimeOut = true;
     this.getChatMembers();
@@ -774,6 +769,12 @@ console.log(msg);
     }
 
   }
+
+
+  testEditMessage(msg:MessageService) {
+    msg.receptorReceive()
+    // alert('cool!')
+  }
 }
 
 

src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts

@@ -3,7 +3,6 @@ import { NavigationStart, Router } from '@angular/router';
 import { customTask, DailyWorkTask } from '../../../models/dailyworktask.model';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { ModalController } from '@ionic/angular';
-import { AlertService } from 'src/app/services/alert.service';
 import { DeplomasStore } from 'src/app/store/deplomas.service';
 import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
 import { SortService } from 'src/app/services/functions/sort.service';
@@ -27,7 +26,6 @@ export class DiplomasAssinarPage implements OnInit {
   constructor(
     private processes:ProcessesService,
     private modalController: ModalController,
-    private alertService: AlertService,
     private router: Router,
     private sortService: SortService,
     public ThemeService: ThemeService

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

@@ -3,7 +3,6 @@ import { ActivatedRoute, NavigationEnd, NavigationExtras, NavigationStart, Route
 import { DailyWorkTask } from '../../../models/dailyworktask.model';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { ModalController, NavParams } from '@ionic/angular';
-import { AlertService } from 'src/app/services/alert.service';
 import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
 import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
 import { DeplomasStore } from 'src/app/store/deplomas.service';
@@ -32,7 +31,6 @@ customTaskPipe = new CustomTaskPipe()
 constructor(
   private processes:ProcessesService,
   private modalController: ModalController,
-  private alertService: AlertService,
   private router: Router,
   private activatedRoute: ActivatedRoute,
   public ThemeService: ThemeService,
@@ -64,10 +62,6 @@ constructor(
     this.router.navigate(['/home/gabinete-digital/diplomas', serialNumber, 'gabinete-digital']);
   }
 
-  notImplemented(){
-    this.alertService.presentAlert('Funcionalidade em desenvolvimento');
-  }
-
   async LoadList() {
     this.skeletonLoader = true;
 

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

@@ -18,8 +18,8 @@ import { Storage } from '@ionic/storage';
 export class EventsToApprovePage implements OnInit {
 
   showLoader: boolean;
-  eventsPRList: any;
-  eventsMDGPRList: any;
+  eventsPRList: any = []
+  eventsMDGPRList: any = []
   eventPerson: EventPerson;
   eventBody: EventBody;
   categories: string[];
@@ -84,7 +84,7 @@ export class EventsToApprovePage implements OnInit {
       let prEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal PR', false).toPromise();
       this.eventsPRList = prEventsOficial.concat(prEventsPessoal);
       this.eventsPRList = this.sortService.sortArrayByDate(this.eventsPRList)
-      
+
       this.storage.set('event-to-aprovePR',this.eventsPRList).then(() => {
         console.log(' EVENTPR TO APROVE SAVED')
       })
@@ -155,6 +155,10 @@ export class EventsToApprovePage implements OnInit {
   }
   close(){
     this.modalController.dismiss(null);
+
+
+
+    // this.RouteService.goBack('/home/gabinetedigital')
   }
 
 

src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts

@@ -3,7 +3,6 @@ import { NavigationStart, Router } from '@angular/router';
 import { customTask, DailyWorkTask } from '../../../models/dailyworktask.model';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { ModalController } from '@ionic/angular';
-import { AlertService } from 'src/app/services/alert.service';
 import { LoginUserRespose } from 'src/app/models/user.model';
 import { AuthService } from 'src/app/services/auth.service';
 import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
@@ -33,7 +32,6 @@ export class ExpedientesPrPage implements OnInit {
   constructor(
     private processes:ProcessesService,
     private modalController: ModalController,
-    private alertService: AlertService,
     private authService: AuthService,
     private router: Router,
     public ThemeService: ThemeService,
@@ -77,7 +75,7 @@ export class ExpedientesPrPage implements OnInit {
         let task = this.expedienteTaskPipe.transform(element);
         this.taskslist.push(task);
       });
-      
+
       this.taskslist = this.sortService.sortDate(this.taskslist, 'CreateDate')
 
       this.expedienteGdStore.reset(this.taskslist);

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

@@ -1,7 +1,6 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { NavigationStart, Router } from '@angular/router';
 import { ProcessesService } from 'src/app/services/processes.service';
-import { AlertService } from 'src/app/services/alert.service';
 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'
@@ -27,7 +26,6 @@ export class ExpedientsPage implements OnInit {
 
   constructor(
     private processes: ProcessesService,
-    private alertService: AlertService,
     private router: Router,
     public ThemeService: ThemeService,
     private sortService: SortService,
@@ -59,10 +57,6 @@ export class ExpedientsPage implements OnInit {
     this.LoadList();
   }
 
-  notImplemented() {
-    this.alertService.presentAlert('Funcionalidade em desenvolvimento');
-  }
-
   LoadList() {
 
     this.skeletonLoader = true

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

@@ -4,7 +4,6 @@ import { CalendarComponent } from 'ionic2-calendar';
 import { customTask, DailyWorkTask } from '../../../models/dailyworktask.model';
 import { ProcessesService } from 'src/app/services/processes.service';
 import { ModalController } from '@ionic/angular';
-import { AlertService } from 'src/app/services/alert.service';
 import { PedidoPage } from 'src/app/pages/gabinete-digital/pedidos/pedido/pedido.page';
 import { PedidosStore } from 'src/app/store/pedidos-store.service';
 import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe';
@@ -45,7 +44,6 @@ export class PedidosPage implements OnInit {
     private router: Router,
     private processes:ProcessesService,
     private modalController: ModalController,
-    private alertService: AlertService,
     private sortService: SortService,
     public ThemeService: ThemeService
     ) {

src/app/shared/header/header.page.html

@@ -133,4 +133,5 @@
     </div>
   </div>
   <div class="header-bottom-line"></div>
+  <!-- {{ RouteService.history | json }} -->
 </div>

src/app/shared/header/header.page.ts

@@ -11,6 +11,7 @@ import { environment } from 'src/environments/environment';
 import { EventTrigger } from '../../services/eventTrigger.service';
 import { ThemeService } from '../../services/theme.service';
 import { interval } from 'rxjs';
+import { RouteService } from 'src/app/services/route.service';
 
 @Component({
   selector: 'app-header',
@@ -39,7 +40,8 @@ export class HeaderPage implements OnInit {
     private platform: Platform,
     //private notificationsService: NotificationsService,
     private eventrigger: EventTrigger,
-    public ThemeService: ThemeService
+    public ThemeService: ThemeService,
+    public RouteService: RouteService
   ) {
     this.loggeduser = SessionStore.user;
     router.events.subscribe((val) => {

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

@@ -4,7 +4,6 @@ import { EventPerson } from 'src/app/models/eventperson.model';
 import { SearchList } from 'src/app/models/search-document';
 import { NewEventPage } from 'src/app/pages/agenda/new-event/new-event.page';
 import { SearchPage } from 'src/app/pages/search/search.page';
-import { AlertService } from 'src/app/services/alert.service';
 import { environment } from 'src/environments/environment';
 import { ThemeService } from 'src/app/services/theme.service'
 
@@ -22,7 +21,6 @@ export class ChatOptionsPopoverPage implements OnInit {
   constructor(
     private popoverController: PopoverController,
     private modalController: ModalController,
-    private alertService: AlertService,
     private navParams: NavParams,
     public ThemeService: ThemeService
   ) {
@@ -43,10 +41,6 @@ export class ChatOptionsPopoverPage implements OnInit {
 
   }
 
-  notImplemented(){
-    this.alertService.presentAlert('Funcionalidade em desenvolvimento');
-  }
-
   takePicture(){
     if( window.innerWidth < 701){
       this.popoverController.dismiss('take-picture');
@@ -97,26 +91,6 @@ export class ChatOptionsPopoverPage implements OnInit {
 
   }
 
-  /* getGroupContacts(room:any){
-    this.showLoader = true;
-    //If group is private call getGroupMembers
-    if(this.room.t === 'p'){
-      this.chatService.getGroupMembers(this.roomId).subscribe(res=>{
-        console.log(res);
-        this.members = res['members'];
-        this.showLoader = false;
-      });
-    }
-    //Otherwise call getChannelMembers for públic groups
-    else{
-      this.chatService.getChannelMembers(this.roomId).subscribe(res=>{
-        console.log(res);
-        this.members = res['members'];
-        this.showLoader = false;
-      });
-    }
-  } */
-
 
   async getDoc(){
     const modal = await this.modalController.create({

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

@@ -6,9 +6,6 @@ import { LoadingService } from 'src/app/services/loading.service';
 import { PublicationsService } from 'src/app/services/publications.service';
 
 import { NewPublicationPage } from 'src/app/pages/publications/new-publication/new-publication.page';
-import { PublicationListStorage } from 'src/app/store/publication-list.service'
-import { PublicationEventFolderStorage } from 'src/app/store/publication-event-folder.service';
-import { PublicationTravelFolderStore } from 'src/app/store/publication-travel-folder.service';
 import { PublicationPipe } from 'src/app/pipes/publication.pipe';
 import { ThemeService } from 'src/app/services/theme.service'
 import { ToastService } from 'src/app/services/toast.service';
@@ -38,11 +35,6 @@ export class ViewPublicationsPage implements OnInit {
   @Output() goBacktoPublicationDetails = new EventEmitter<any>();
 
 
-  publicationListStorage = PublicationListStorage
-  //
-  publicationEventFolderStorage = PublicationEventFolderStorage
-  publicationTravelFolderService = PublicationTravelFolderStore
-
   publicationPipe = new PublicationPipe()
 
   constructor(
@@ -136,7 +128,6 @@ export class ViewPublicationsPage implements OnInit {
       this.storage.set('view_publications', this.publicationList);
       console.log('PUBLICATIONS IMAGEs',this.publicationList)
 
-      this.publicationListStorage.add(folderId, this.publicationList)
       this.getpublication = this.publicationList;
       this.showLoader = false;
     },() => {
@@ -162,7 +153,6 @@ export class ViewPublicationsPage implements OnInit {
         this.publicationList.push(item);
       });
 
-      this.publicationListStorage.add(folderId, this.publicationList)
       await this.storage.remove('view_publications');
       await this.storage.set('view_publications', this.publicationList);
       //this.getFromDB();
@@ -172,7 +162,6 @@ export class ViewPublicationsPage implements OnInit {
       if(error.status == '404') {
         this.error = 'Sem publicações disponíveis!';
         this.publicationList= [];
-        this.publicationListStorage.add(folderId, this.publicationList)
       }
 
       this.showLoader = false;