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.html b/src/app/pages/chat/chat.page.html index 8ee94ec3b..e78bcaa91 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -38,56 +38,58 @@ -
+
- - +
-
+
-
+
{{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}}
- -
@@ -108,7 +110,7 @@ [style.display]="showMessages ? 'flex' : 'none'" [roomId]="roomId" [showMessages]="showMessages" #messagecontainer> - + { + if(params["params"].SerialNumber) { + this.roomId = params["params"].roomId; + } + }); */ this.loggedUser = authService.ValidatedUserChat['data']; this.roomId = this.navParams.get('roomId'); } 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')