diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 8c082f7db..564618489 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -16,14 +16,6 @@ const routes: Routes = [
path: 'empty-chat',
loadChildren: () => import('./shared/chat/empty-chat/empty-chat.module').then( m => m.EmptyChatPageModule)
},
- {
- path: 'btn-criar',
- loadChildren: () => import('./shared/buttons/btn-criar/btn-criar.module').then( m => m.BtnCriarPageModule)
- },
- {
- path: 'btn-adicionar',
- loadChildren: () => import('./shared/buttons/btn-adicionar/btn-adicionar.module').then( m => m.BtnAdicionarPageModule)
- },
{
path: 'empty-container',
loadChildren: () => import('./shared/empty-container/empty-container.module').then( m => m.EmptyContainerPageModule)
@@ -120,6 +112,22 @@ const routes: Routes = [
path: 'fingerprint',
loadChildren: () => import('./shared/fingerprint/fingerprint.module').then( m => m.FingerprintPageModule)
},
+ {
+ path: 'new-event',
+ loadChildren: () => import('./shared/agenda/new-event/new-event.module').then( m => m.NewEventPageModule)
+ },
+ {
+ path: 'edit-event',
+ loadChildren: () => import('./shared/agenda/edit-event/edit-event.module').then( m => m.EditEventPageModule)
+ },
+ {
+ path: 'event-list',
+ loadChildren: () => import('./shared/agenda/event-list/event-list.module').then( m => m.EventListPageModule)
+ },
+ {
+ path: 'approve-event',
+ loadChildren: () => import('./shared/agenda/approve-event/approve-event.module').then( m => m.ApproveEventPageModule)
+ },
/* {
path: 'chat',
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 29a6ee156..642a4a317 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -35,8 +35,8 @@ import { ChatService } from './services/chat.service'
@NgModule({
- declarations: [AppComponent,MessagesPage,],
- entryComponents: [MessagesPage],
+ declarations: [AppComponent],
+ entryComponents: [],
imports: [BrowserModule,
CommonModule,
FormsModule,
diff --git a/src/app/components/components.module.ts b/src/app/components/components.module.ts
index 090dc2d19..3cdff95ee 100644
--- a/src/app/components/components.module.ts
+++ b/src/app/components/components.module.ts
@@ -1,28 +1,12 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
-import { HeaderPage } from '../shared/header/header.page';
-import { BtnSeguintePage } from '../shared/btn-seguinte/btn-seguinte.page';
-import { BtnModalDismissPage } from '../shared/btn-modal-dismiss/btn-modal-dismiss.page';
-import { EmptyChatPage } from '../shared/chat/empty-chat/empty-chat.page';
-import { BtnCriarPage } from '../shared/buttons/btn-criar/btn-criar.page';
-import { BtnAdicionarPage } from '../shared/buttons/btn-adicionar/btn-adicionar.page';
-import { HeaderNoSearchPage } from '../shared/headers/header-no-search/header-no-search.page';
-
-
@NgModule({
+
declarations: [],
- exports: [
- HeaderPage,
- HeaderNoSearchPage,
- BtnSeguintePage,
- BtnModalDismissPage,
- EmptyChatPage,
- BtnCriarPage,
- BtnAdicionarPage,
- ],
+ exports: [],
imports: [
- CommonModule
+ CommonModule,
]
})
export class ComponentsModule { }
diff --git a/src/app/config/auth-constants.ts b/src/app/config/auth-constants.ts
index e6769cfd5..677d091cc 100644
--- a/src/app/config/auth-constants.ts
+++ b/src/app/config/auth-constants.ts
@@ -4,4 +4,5 @@ export class AuthConnstants{
public static readonly AUTH = 'userDataKey';
public static readonly PROFILE = 'profile';
public static readonly USER = 'userId';
+ public static readonly USERCHAT = 'userChat';
}
\ No newline at end of file
diff --git a/src/app/modals/create-process/create-process.module.ts b/src/app/modals/create-process/create-process.module.ts
index bde6665cf..5574afdd6 100644
--- a/src/app/modals/create-process/create-process.module.ts
+++ b/src/app/modals/create-process/create-process.module.ts
@@ -9,18 +9,20 @@ import { CreateProcessPageRoutingModule } from './create-process-routing.module'
import { CreateProcessPage } from './create-process.page';
import { AttendeeModalPage } from 'src/app/shared/event/attendee-modal/attendee-modal.page';
import { EmptyContainerPage } from 'src/app/shared/empty-container/empty-container.page';
+import { EmptyContainerPageModule } from 'src/app/shared/empty-container/empty-container.module';
+import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
- CreateProcessPageRoutingModule
+ CreateProcessPageRoutingModule,
+ EmptyContainerPageModule,
+ AttendeeModalPageModule
],
declarations: [
- CreateProcessPage,
- AttendeeModalPage,
- EmptyContainerPage,
+ CreateProcessPage
]
})
export class CreateProcessPageModule {}
diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html
index dde835def..aa3272b4f 100644
--- a/src/app/modals/create-process/create-process.page.html
+++ b/src/app/modals/create-process/create-process.page.html
@@ -5,7 +5,7 @@
{{customDate}}
-das {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'hh:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}
-(Não se repete)
-Repete
-{{loadedEvent.workflowInstanceDataFields.Participants}}
-{{loadedEvent.workflowInstanceDataFields.Body}}
-Receita por Natureza
-{{loadedAttachments.Remetente}}{{loadedAttachments.CreateDate}}
-Text Text
-{{ attendee.EmailAddress }}
diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.module.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.module.ts index aa4ed1f1b..2223c9033 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.module.ts +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.module.ts @@ -8,17 +8,29 @@ import { BookMeetingModalPageRoutingModule } from './book-meeting-modal-routing. import { BookMeetingModalPage } from './book-meeting-modal.page'; import { AttendeeModalPage } from 'src/app/shared/event/attendee-modal/attendee-modal.page'; +import { AttendeesPageModule } from 'src/app/shared/event/attendees/attendees.module'; +import { EmptyContainerPageModule } from 'src/app/shared/empty-container/empty-container.module'; +import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; +import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module'; @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, - BookMeetingModalPageRoutingModule + BookMeetingModalPageRoutingModule, + // + // AttendeesPageModule, + + EmptyContainerPageModule, + + AttendeeModalPageModule, + EmptyContainerPageModule, + BtnModalDismissPageModule, + ], declarations: [ - BookMeetingModalPage, - AttendeeModalPage + BookMeetingModalPage ] }) export class BookMeetingModalPageModule {} diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.module.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.module.ts index 89e72ae19..10d4ca393 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.module.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.module.ts @@ -9,18 +9,26 @@ import { ExpedientTaskModalPageRoutingModule } from './expedient-task-modal-rout import { ExpedientTaskModalPage } from './expedient-task-modal.page'; import { AttendeeModalPage } from 'src/app/shared/event/attendee-modal/attendee-modal.page'; import { EmptyContainerPage } from 'src/app/shared/empty-container/empty-container.page'; +import { AttendeesPageModule } from 'src/app/shared/event/attendees/attendees.module'; +import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module'; +import { EmptyContainerPageModule } from 'src/app/shared/empty-container/empty-container.module'; +import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, - ExpedientTaskModalPageRoutingModule + ExpedientTaskModalPageRoutingModule, + // + AttendeesPageModule, + AttendeeModalPageModule, + EmptyContainerPageModule, + BtnModalDismissPageModule, + ], declarations: [ - ExpedientTaskModalPage, - AttendeeModalPage, - EmptyContainerPage, + ExpedientTaskModalPage ], entryComponents: [ EmptyContainerPage,] diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html index a8d166ee7..b6091247d 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html @@ -124,8 +124,6 @@Expediente Presidente
-Expediente
+Expediente Presidente
+Expediente
{{count_exp_pr}} Documentos
Diplomas assinados PR
+Diplomas assinados PR
Diplomas
{{ count_dip_as_pr }} Documentos
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index beccdd061..72577ea63 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -12,7 +12,6 @@ import { AuthService } from 'src/app/services/auth.service'; import { User } from 'src/app/models/user.model'; import { DespachosPrPage } from 'src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page' import { DiplomasPage } from 'src/app/shared/gabinete-digital/diplomas/diplomas.page'; -import { SignedDiplomaComponent } from 'src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component'; @Component({ selector: 'app-gabinete-digital', templateUrl: './gabinete-digital.page.html', @@ -69,6 +68,8 @@ export class GabineteDigitalPage implements OnInit { serialNumber:string; loggeduser: User; + mdgpr = "MDGPR"; + pr = "PR" constructor( private processesbackend:ProcessesService, @@ -375,7 +376,7 @@ export class GabineteDigitalPage implements OnInit { } } - openDespachosPage(segment:string) { + openDespachosPage(segment?:string) { this.closeAllDesktopComponents(); if( window.innerWidth <= 800){ //this.openDespachoList(); @@ -388,7 +389,7 @@ export class GabineteDigitalPage implements OnInit { } } - openDespachosPrPage(segment:string) { + openDespachosPrPage(segment?:string) { this.closeAllDesktopComponents(); if( window.innerWidth <= 800){ //this.openDespachoListPr(); @@ -401,7 +402,7 @@ export class GabineteDigitalPage implements OnInit { } } - openPendentesPage(segment:string){ + openPendentesPage(segment?:string){ this.closeAllDesktopComponents(); if( window.innerWidth <= 800){ //this.openPendenteList(); @@ -414,7 +415,7 @@ export class GabineteDigitalPage implements OnInit { } } - openExpedientesPrPage(segment:string){ + openExpedientesPrPage(segment?:string){ this.closeAllDesktopComponents(); if( window.innerWidth <= 800) { //this.openExpedientList(); @@ -486,19 +487,6 @@ export class GabineteDigitalPage implements OnInit { } } - async openSignedDiplom(){ - const modal = await this.modalController.create({ - component: SignedDiplomaComponent, - componentProps:{ - profile: this.profile, - }, - cssClass: 'modal modal-desktop', - //backdropDismiss: false - }); - await modal.present(); - modal.onDidDismiss(); - } - async openDeploma() { const modal = await this.modalController.create({ component: DiplomasPage, diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.module.ts b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.module.ts index 3f4d3915f..c6b78fdf1 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.module.ts +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.module.ts @@ -9,6 +9,8 @@ import { PedidoPageRoutingModule } from './pedido-routing.module'; import { PedidoPage } from './pedido.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; +import { HeaderPageModule } from 'src/app/shared/header/header.module'; +import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; @NgModule({ imports: [ @@ -16,7 +18,9 @@ import { ComponentsModule } from 'src/app/components/components.module'; FormsModule, IonicModule, ComponentsModule, - PedidoPageRoutingModule + PedidoPageRoutingModule, + HeaderPageModule, + BtnModalDismissPageModule, ], declarations: [PedidoPage] }) diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html index d2de06148..4802585c9 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html @@ -107,7 +107,6 @@ diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.scss b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.scss index a2f88e2f3..b28c08b5b 100644 --- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.scss +++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.scss @@ -41,6 +41,13 @@ float: left; margin: 2.5px 0 0 5px; } + .adicionar{ + padding: 0!important; + float: right; + font-size: 15px; + color: #0782c9; + margin: 8px 5px 0 5px; + } .title{ font-size: 25px; } diff --git a/src/app/shared/chat/group-messages/group-messages.module.ts b/src/app/shared/chat/group-messages/group-messages.module.ts index 49e439273..73a6eda80 100644 --- a/src/app/shared/chat/group-messages/group-messages.module.ts +++ b/src/app/shared/chat/group-messages/group-messages.module.ts @@ -8,8 +8,8 @@ import { GroupMessagesPageRoutingModule } from './group-messages-routing.module' import { GroupMessagesPage } from './group-messages.page'; import { SharedModule } from 'src/app/shared/shared.module'; -import { PopoverModule } from 'src/app/shared/popover/chat-popover/popover.modules'; import { ComponentsModule } from 'src/app/components/components.module'; +import { ChatPopoverPageModule } from '../../popover/chat-popover/chat-popover.module'; @NgModule({ imports: [ @@ -17,9 +17,10 @@ import { ComponentsModule } from 'src/app/components/components.module'; FormsModule, IonicModule, ComponentsModule, - PopoverModule, + ChatPopoverPageModule, GroupMessagesPageRoutingModule ], + exports: [GroupMessagesPage], declarations: [GroupMessagesPage] }) export class GroupMessagesPageModule {} diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts index f94dbc9ee..2fa69fa06 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.ts +++ b/src/app/shared/chat/group-messages/group-messages.page.ts @@ -225,7 +225,7 @@ export class GroupMessagesPage implements OnInit, OnChanges { }); } - openSendGroupMessageOptions(ev: any){ + openSendGroupMessageOptions(ev?: any){ if(window.innerWidth <= 1024){ console.log('mobile'); this.openChatOptions(ev); diff --git a/src/app/shared/chat/messages/contacts/contacts.module.ts b/src/app/shared/chat/messages/contacts/contacts.module.ts index fdd7b48b0..56e3bca48 100644 --- a/src/app/shared/chat/messages/contacts/contacts.module.ts +++ b/src/app/shared/chat/messages/contacts/contacts.module.ts @@ -10,6 +10,7 @@ import { ContactsPage } from './contacts.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { FilterPipe } from 'src/app/pipes/filter.pipe'; import { ComponentsModule } from 'src/app/components/components.module'; +import { PipesModule } from 'src/app/pipes/pipes.module'; @NgModule({ imports: [ @@ -17,9 +18,10 @@ import { ComponentsModule } from 'src/app/components/components.module'; FormsModule, IonicModule, ComponentsModule, - ContactsPageRoutingModule + ContactsPageRoutingModule, + PipesModule, ], - exports: [FilterPipe], - declarations: [ContactsPage, FilterPipe] + exports: [ContactsPage], + declarations: [ContactsPage] }) export class ContactsPageModule {} diff --git a/src/app/shared/chat/messages/messages.module.ts b/src/app/shared/chat/messages/messages.module.ts index 9fa17b9c8..455729837 100644 --- a/src/app/shared/chat/messages/messages.module.ts +++ b/src/app/shared/chat/messages/messages.module.ts @@ -18,7 +18,7 @@ import { ComponentsModule } from 'src/app/components/components.module'; ComponentsModule, MessagesPageRoutingModule ], - declarations: [MessagesPage], - exports: [MessagesPage] + exports: [MessagesPage], + declarations: [MessagesPage] }) export class MessagesPageModule {} diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts index 67eb8769e..8adcae76a 100644 --- a/src/app/shared/chat/messages/messages.page.ts +++ b/src/app/shared/chat/messages/messages.page.ts @@ -154,7 +154,7 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges { modal.onDidDismiss(); } - openSendMessageOptions(ev:any){ + openSendMessageOptions(ev?:any){ if(window.innerWidth <= 1024){ console.log('mobile'); this.openChatOptions(ev); diff --git a/src/app/shared/chat/new-group/contacts/contacts.module.ts b/src/app/shared/chat/new-group/contacts/contacts.module.ts index 92557bb61..942581b58 100644 --- a/src/app/shared/chat/new-group/contacts/contacts.module.ts +++ b/src/app/shared/chat/new-group/contacts/contacts.module.ts @@ -9,6 +9,7 @@ import { ContactsPageRoutingModule } from './contacts-routing.module'; import { ContactsPage } from './contacts.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; +import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.module'; @NgModule({ imports: [ @@ -16,7 +17,8 @@ import { ComponentsModule } from 'src/app/components/components.module'; FormsModule, IonicModule, ComponentsModule, - ContactsPageRoutingModule + ContactsPageRoutingModule, + BtnSeguintePageModule, ], declarations: [ContactsPage] }) diff --git a/src/app/shared/chat/new-group/group-chat/group-chat.module.ts b/src/app/shared/chat/new-group/group-chat/group-chat.module.ts index e976a36ec..2db5ec117 100644 --- a/src/app/shared/chat/new-group/group-chat/group-chat.module.ts +++ b/src/app/shared/chat/new-group/group-chat/group-chat.module.ts @@ -9,6 +9,8 @@ import { GroupChatPageRoutingModule } from './group-chat-routing.module'; import { GroupChatPage } from './group-chat.page'; import { SharedModule } from 'src/app/shared/shared.module'; import { ComponentsModule } from 'src/app/components/components.module'; +import { BtnSeguintePageModule } from 'src/app/shared/btn-seguinte/btn-seguinte.module'; +import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module'; @NgModule({ imports: [ @@ -16,7 +18,9 @@ import { ComponentsModule } from 'src/app/components/components.module'; FormsModule, IonicModule, ComponentsModule, - GroupChatPageRoutingModule + GroupChatPageRoutingModule, + BtnSeguintePageModule, + BtnModalDismissPageModule, ], declarations: [GroupChatPage] }) diff --git a/src/app/shared/chat/new-group/new-group.module.ts b/src/app/shared/chat/new-group/new-group.module.ts index c72df1781..b9ea20a58 100644 --- a/src/app/shared/chat/new-group/new-group.module.ts +++ b/src/app/shared/chat/new-group/new-group.module.ts @@ -18,6 +18,7 @@ import { ComponentsModule } from 'src/app/components/components.module'; ComponentsModule, NewGroupPageRoutingModule ], + exports: [NewGroupPage], declarations: [NewGroupPage] }) export class NewGroupPageModule {} diff --git a/src/app/shared/chat/new-group/new-group.page.html b/src/app/shared/chat/new-group/new-group.page.html index 02dc25311..a8f9ccd2a 100644 --- a/src/app/shared/chat/new-group/new-group.page.html +++ b/src/app/shared/chat/new-group/new-group.page.html @@ -5,7 +5,11 @@{{event.StartDate | date: 'hh:mm'}}
-{{event.EndDate | date: 'hh:mm'}}
-{{event.StartDate | date: 'd/M/yy' }} - {{ event.EndDate | date: 'dd/mm/yy'}} | {{event.Location}}
-{{event.StartDate | date: 'd/M/yy' }} | {{event.Location}}
-
-
-