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

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

@@ -769,6 +769,12 @@ console.log(msg);
     }
 
   }
+
+
+  testEditMessage(msg:MessageService) {
+    msg.receptorReceive()
+    // alert('cool!')
+  }
 }
 
 

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[];
@@ -155,6 +155,10 @@ export class EventsToApprovePage implements OnInit {
   }
   close(){
     this.modalController.dismiss(null);
+
+
+
+    // this.RouteService.goBack('/home/gabinetedigital')
   }
 
 

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/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;