From 189f35ae461be1fb6ed2713764123c3aa0dd77fa Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Mon, 26 Jul 2021 22:51:13 +0100 Subject: [PATCH 1/4] save --- src/app/pages/chat/chat.page.html | 8 +++++--- src/app/pages/chat/chat.page.scss | 9 ++++++++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index 8ee94ec3b..4219e2cc0 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -38,12 +38,14 @@ -
+
- +
@@ -108,7 +110,7 @@ [style.display]="showMessages ? 'flex' : 'none'" [roomId]="roomId" [showMessages]="showMessages" #messagecontainer> - + Date: Tue, 27 Jul 2021 00:01:38 +0100 Subject: [PATCH 2/4] save --- src/app/pages/chat/chat.page.html | 36 +++++++++++++++---------------- src/app/pages/chat/chat.page.scss | 24 +++++++++++++++++++-- src/app/pages/chat/chat.page.ts | 3 +++ 3 files changed, 43 insertions(+), 20 deletions(-) diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index 4219e2cc0..e78bcaa91 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -41,55 +41,55 @@
- - +
-
+
-
+
{{user}}
-
{{dm._updatedAt | date: 'HH:mm'}}
+
{{dm._updatedAt | date: 'HH:mm'}}
-
+
{{dm.lastMessage.msg}}
- +
- - -
+
-
+
-
+
{{group.name.split('-').join(' ')}}
-
{{group.lastMessage._updatedAt | date: 'HH:mm'}}
+
{{group.lastMessage._updatedAt | date: 'HH:mm'}}
-
+
{{group.lastMessage.u.name}}: {{group.lastMessage.msg}}
- -
diff --git a/src/app/pages/chat/chat.page.scss b/src/app/pages/chat/chat.page.scss index dddff7f8a..ac3c068b3 100644 --- a/src/app/pages/chat/chat.page.scss +++ b/src/app/pages/chat/chat.page.scss @@ -51,7 +51,7 @@ ion-content{ } .aside{ - padding: 0px 20px 0 20px !important; + padding: 0 !important; } } @@ -73,6 +73,7 @@ ion-content{ .item{ width: 100%; border-bottom: 1px solid #ebebeb; + padding: 0px 20px 0 20px !important; overflow: auto; .item-icon{ @@ -86,8 +87,9 @@ ion-content{ } .item-content{ width: 317px; - float:right + float:right; } + .item-title-time{ width: 100%; overflow: auto; @@ -99,6 +101,9 @@ ion-content{ font-size: 15px; color: #0d89d1; } + .item-title-active{ + color: #fff; +} .item-date{ width: 20%; float: right; @@ -106,10 +111,20 @@ ion-content{ color: #797979; text-align: right; } + .item-date-active{ + color: #fff; + } .item-description{ font-size: 13px; color: #000; } + .item-description-active{ + color: #fff; + } +} +.item-active{ + color: #fff !important; + background-color: #42b9fe !important; } @media only screen and (min-width: 801px) { .main-content{ @@ -142,3 +157,8 @@ ion-content{ } } + +.highlight { + color: #fff !important; + background-color: #42b9fe !important; +} diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index 2e5485424..c397698bb 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -49,6 +49,7 @@ export class ChatPage implements OnInit { userDirectMessages: any[]; result:any; dmUsers:any; + idSelected: string; desktopComponent: any = { showMessages: false, @@ -177,6 +178,7 @@ hideRefreshButton(){ } } openMessagesPage(rid) { + this.idSelected = rid; if( window.innerWidth < 801){ this.openMessagesModal(rid); } @@ -220,6 +222,7 @@ hideRefreshButton(){ } openGroupMessagesPage(rid) { + this.idSelected = rid; console.log(rid); if( window.innerWidth < 801){ From 41cefc05a3aeeeae5f7e43ceb94dc74dd1174ceb Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Tue, 27 Jul 2021 00:08:25 +0100 Subject: [PATCH 3/4] save --- .../expediente/expediente-detail/expediente-detail.page.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index 5d15ce2b5..8061f5af1 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -260,7 +260,7 @@ export class ExpedienteDetailPage implements OnInit { try { await this.processes.CompleteTask(otherbody).toPromise() - this.toastService.successMessage('Processo descartado'); + //this.toastService.successMessage('Processo descartado'); this.goBack(); } catch (error) { this.toastService.badRequest('Processo não descartado') @@ -278,7 +278,7 @@ export class ExpedienteDetailPage implements OnInit { const loader = this.toastService.loading() try { await this.processes.CompleteTask(body).toPromise(); - this.toastService.successMessage('Processo descartado'); + //this.toastService.successMessage('Processo descartado'); this.goBack(); } catch (error) { this.toastService.badRequest('Processo não descartado') From 130fc886ea7449858ed2f969ae34a67834ec82ce Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Tue, 27 Jul 2021 00:21:30 +0100 Subject: [PATCH 4/4] save --- src/app/home/home-routing.module.ts | 26 ++++++++++---------- src/app/pages/chat/chat.page.ts | 3 +++ src/app/pages/chat/messages/messages.page.ts | 10 ++++++-- 3 files changed, 24 insertions(+), 15 deletions(-) diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts index 83fdd6ad4..12ce18448 100644 --- a/src/app/home/home-routing.module.ts +++ b/src/app/home/home-routing.module.ts @@ -52,7 +52,7 @@ const routes: Routes = [ }, ], - + }, { path: 'attendees', @@ -62,7 +62,7 @@ const routes: Routes = [ loadChildren: ()=> import('../pages/events/attendees/attendees.module').then(m => m.AttendeesPageModule) }, ], - + }, { path: 'attendees-modal', @@ -72,7 +72,7 @@ const routes: Routes = [ loadChildren: ()=> import('../shared/event/attendee-modal/attendee-modal.module').then(m => m.AttendeeModalPageModule) }, ], - + }, // { // path: 'login', @@ -83,7 +83,7 @@ const routes: Routes = [ // }, // ], // canActivate: [LoginGuard] - + // }, { path: 'agenda', @@ -131,7 +131,7 @@ const routes: Routes = [ ] }, ], - + }, { path: 'gabinete-digital', @@ -268,7 +268,7 @@ const routes: Routes = [ loadChildren: ()=> import('../pages/search/search.module').then(m => m.SearchPageModule) } ], - + }, { path: 'publications', @@ -288,7 +288,7 @@ const routes: Routes = [ path:':folderId/:publicationId', loadChildren: ()=> import('../pages/publications/view-publications/publication-detail/publication-detail.module').then(m => m.PublicationDetailPageModule) }, - ] + ] }, { path:'new-publication', @@ -299,7 +299,7 @@ const routes: Routes = [ loadChildren: () => import('../shared/popover/request-options/request-options.module').then( m => m.RequestOptionsPageModule) }, ], - + }, { path: 'chat', @@ -312,7 +312,7 @@ const routes: Routes = [ path:'messages', children: [ { - path:'', + path:':roomId', loadChildren: ()=> import('../pages/chat/messages/messages.module').then(m => m.MessagesPageModule) }, { @@ -344,7 +344,7 @@ const routes: Routes = [ }, ], - + }, { path: 'document-detail', @@ -354,7 +354,7 @@ const routes: Routes = [ loadChildren: ()=> import('../modals/document-detail/document-detail.module').then(m => m.DocumentDetailPageModule) }, ], - + }, { path: 'inactivity', @@ -364,11 +364,11 @@ const routes: Routes = [ loadChildren: ()=> import('../pages/inactivity/inactivity.module').then(m => m.InactivityPageModule) }, ], - + }, ], canActivate: [AuthGuard] - + } ]; diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index c397698bb..8ffdf729a 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -22,6 +22,7 @@ import { EditGroupPage } from 'src/app/shared/chat/edit-group/edit-group.page'; import * as Rx from "rxjs/Rx"; import { Message } from 'src/app/models/message.model'; import { Observable, Subject } from "rxjs/Rx"; +import { Router } from '@angular/router'; @Component({ selector: 'app-chat', @@ -101,6 +102,7 @@ export class ChatPage implements OnInit { private authService: AuthService, private storage:Storage, private resolver: ComponentFactoryResolver, + private router: Router, ){ this.loggedUserChat = authService.ValidatedUserChat['data']; this.headers = new HttpHeaders(); @@ -181,6 +183,7 @@ hideRefreshButton(){ this.idSelected = rid; if( window.innerWidth < 801){ this.openMessagesModal(rid); + //this.router.navigate(['/home/chat/messages',rid,]); } else{ this.closeAllDesktopComponents(); diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts index 6dbb2047f..a4ddabcaa 100644 --- a/src/app/pages/chat/messages/messages.page.ts +++ b/src/app/pages/chat/messages/messages.page.ts @@ -1,5 +1,5 @@ import { AfterViewChecked, Component, ElementRef, OnInit, ViewChild } from '@angular/core'; -import {Router} from '@angular/router' +import {ActivatedRoute, Router} from '@angular/router' import { ModalController, NavParams, PopoverController } from '@ionic/angular'; import { Status } from 'src/app/models/chat/status.model'; import { ContactsPage } from 'src/app/pages/chat/messages/contacts/contacts.page'; @@ -38,8 +38,14 @@ export class MessagesPage implements OnInit, AfterViewChecked { private authService: AuthService, private alertService: AlertService, private toastService: ToastService, - private route: Router + private route: Router, + private activatedRoute: ActivatedRoute, ) { + /* this.activatedRoute.paramMap.subscribe(params => { + if(params["params"].SerialNumber) { + this.roomId = params["params"].roomId; + } + }); */ this.loggedUser = authService.ValidatedUserChat['data']; this.roomId = this.navParams.get('roomId'); }