This commit is contained in:
tiago.kayaya
2021-06-02 21:22:26 +01:00
parent 55f758f2da
commit 462a68fce4
37 changed files with 101 additions and 98 deletions
+62 -3
View File
@@ -19,6 +19,24 @@ import { ApproveEventComponent } from '../shared/agenda/approve-event/approve-ev
import { AttendeesPage } from '../shared/event/attendees/attendees.page';
import { AttendeeModalPage } from '../shared/event/attendee-modal/attendee-modal.page';
import { EventsToApprovePage } from '../shared/gabinete-digital/events-to-approve/events-to-approve.page';
import { MessagesPage } from '../shared/chat/messages/messages.page';
import { ContactsPage } from '../shared/chat/messages/contacts/contacts.page';
import { GroupMessagesPage } from '../shared/chat/group-messages/group-messages.page';
import { NewGroupPage } from '../shared/chat/new-group/new-group.page';
import { EditGroupPage } from '../shared/chat/edit-group/edit-group.page';
import { GroupContactsPage } from '../shared/chat/group-messages/group-contacts/group-contacts.page';
import { ChatPopoverPage } from '../shared/popover/chat-popover/chat-popover.page';
import { EmptyContainerPage } from '../shared/empty-container/empty-container.page';
import { ExpedientePage } from '../shared/gabinete-digital/expediente/expediente.page';
import { ExpedientsPage } from '../shared/gabinete-digital/expedients/expedients.page';
import { PedidosPage } from '../shared/gabinete-digital/pedidos/pedidos.page';
import { DespachosPage } from '../shared/gabinete-digital/despachos/despachos.page';
import { PendentesPage } from '../shared/gabinete-digital/pendentes/pendentes.page';
import { DespachosPrPage } from '../shared/gabinete-digital/despachos-pr/despachos-pr.page';
import { DiplomasPage } from '../pages/gabinete-digital/diplomas/diplomas.page';
import { ExpedientesPrPage } from '../shared/gabinete-digital/expedientes-pr/expedientes-pr.page';
import { SignedDiplomaComponent } from '../shared/gabinete-digital/signed-diploma/signed-diploma.component';
import { DiplomasAssinarPage } from '../shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page';
@@ -28,7 +46,6 @@ import { EventsToApprovePage } from '../shared/gabinete-digital/events-to-approv
HeaderNoSearchPage,
BtnSeguintePage,
BtnModalDismissPage,
EmptyChatPage,
BtnCriarPage,
BtnAdicionarPage,
@@ -40,18 +57,37 @@ import { EventsToApprovePage } from '../shared/gabinete-digital/events-to-approv
NewEventPage,
EditEventComponent,
ViewEventPage,
EventListComponent,
ApproveEventComponent,
AttendeesPage,
AttendeeModalPage,
MessagesPage,
ContactsPage,
GroupMessagesPage,
NewGroupPage,
EditGroupPage,
GroupContactsPage,
EmptyChatPage,
EventListComponent,
EmptyContainerPage,
EventsToApprovePage,
ExpedientePage,
ExpedientsPage,
PedidosPage,
DespachosPage,
PendentesPage,
DespachosPrPage,
DiplomasPage,
ExpedientesPrPage,
SignedDiplomaComponent,
DiplomasAssinarPage
],
exports: [
HeaderPage,
HeaderNoSearchPage,
BtnSeguintePage,
BtnModalDismissPage,
EmptyChatPage,
BtnCriarPage,
BtnAdicionarPage,
@@ -68,6 +104,29 @@ import { EventsToApprovePage } from '../shared/gabinete-digital/events-to-approv
AttendeesPage,
AttendeeModalPage,
EventsToApprovePage,
MessagesPage,
ContactsPage,
GroupMessagesPage,
NewGroupPage,
EditGroupPage,
GroupContactsPage,
EmptyChatPage,
ChatPopoverPage,
EventListComponent,
EmptyContainerPage,
EventsToApprovePage,
ExpedientePage,
ExpedientsPage,
PedidosPage,
DespachosPage,
PendentesPage,
DespachosPrPage,
DiplomasPage,
ExpedientesPrPage,
SignedDiplomaComponent,
DiplomasAssinarPage
],
imports: [
CommonModule
@@ -18,9 +18,7 @@ import { EmptyContainerPage } from 'src/app/shared/empty-container/empty-contain
CreateProcessPageRoutingModule
],
declarations: [
CreateProcessPage,
AttendeeModalPage,
EmptyContainerPage,
CreateProcessPage
]
})
export class CreateProcessPageModule {}
+1 -2
View File
@@ -17,8 +17,7 @@ import { AttendeeModalPage } from 'src/app/shared/event/attendee-modal/attendee-
DelegarPageRoutingModule
],
declarations: [
DelegarPage,
AttendeeModalPage,
DelegarPage
]
})
export class DelegarPageModule {}
@@ -17,8 +17,7 @@ import { AttendeeModalPage } from 'src/app/shared/event/attendee-modal/attendee-
EditEventPageRoutingModule
],
declarations: [
EditEventPage,
AttendeeModalPage
EditEventPage
]
})
export class EditEventPageModule {}
+2 -17
View File
@@ -30,24 +30,9 @@ import { ComponentsModule } from 'src/app/components/components.module';
RouterModule,
],
declarations: [
ChatPage,
MessagesPage,
ContactsPage,
GroupMessagesPage,
NewGroupPage,
EditGroupPage,
GroupContactsPage,
EmptyChatPage,
ChatPage
],
schemas: [CUSTOM_ELEMENTS_SCHEMA],
entryComponents: [
MessagesPage,
ContactsPage,
GroupMessagesPage,
NewGroupPage,
EditGroupPage,
GroupContactsPage,
EmptyChatPage,
]
entryComponents: []
})
export class ChatPageModule {}
@@ -18,6 +18,6 @@ import { ComponentsModule } from 'src/app/components/components.module';
DiplomasPageRoutingModule,
ComponentsModule
],
declarations: [DiplomasPage]
declarations: []
})
export class DiplomasPageModule {}
@@ -17,8 +17,7 @@ import { AttendeeModalPage } from 'src/app/shared/event/attendee-modal/attendee-
BookMeetingModalPageRoutingModule
],
declarations: [
BookMeetingModalPage,
AttendeeModalPage
BookMeetingModalPage
]
})
export class BookMeetingModalPageModule {}
@@ -18,9 +18,7 @@ import { EmptyContainerPage } from 'src/app/shared/empty-container/empty-contain
ExpedientTaskModalPageRoutingModule
],
declarations: [
ExpedientTaskModalPage,
AttendeeModalPage,
EmptyContainerPage,
ExpedientTaskModalPage
],
entryComponents: [
EmptyContainerPage,]
@@ -23,7 +23,6 @@ import { ExpedientesPrPage } from 'src/app/shared/gabinete-digital/expedientes-p
import { SignedDiplomaComponent } from 'src/app/shared/gabinete-digital/signed-diploma/signed-diploma.component';
import { DiplomasAssinarPage } from 'src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page';
import { ComponentsModule } from 'src/app/components/components.module';
/* import { ComponentsModule } from 'src/app/components/components.module'; */
@NgModule({
imports: [
@@ -34,35 +33,9 @@ import { ComponentsModule } from 'src/app/components/components.module';
GabineteDigitalPageRoutingModule
],
declarations: [
GabineteDigitalPage,
EventListComponent,
EmptyContainerPage,
EventsToApprovePage,
ExpedientePage,
ExpedientsPage,
PedidosPage,
DespachosPage,
PendentesPage,
DespachosPrPage,
DiplomasPage,
ExpedientesPrPage,
SignedDiplomaComponent,
DiplomasAssinarPage
],
entryComponents: [
EmptyContainerPage,
EventsToApprovePage,
ExpedientePage,
ExpedientsPage,
PedidosPage,
DespachosPage,
PendentesPage,
DespachosPrPage,
DiplomasPage,
ExpedientesPrPage,
SignedDiplomaComponent,
DiplomasAssinarPage
GabineteDigitalPage
],
entryComponents: [],
schemas: [CUSTOM_ELEMENTS_SCHEMA]
})
export class GabineteDigitalPageModule {}
@@ -19,9 +19,6 @@ import { ComponentsModule } from 'src/app/components/components.module';
ComponentsModule,
ViewEventPageRoutingModule
],
declarations: [
ViewEventPage,
ChatPopoverPage
]
declarations: []
})
export class ViewEventPageModule {}
@@ -15,6 +15,6 @@ import { BtnModalDismissPage } from './btn-modal-dismiss.page';
IonicModule,
BtnModalDismissPageRoutingModule
],
declarations: [BtnModalDismissPage]
declarations: []
})
export class BtnModalDismissPageModule {}
@@ -15,6 +15,6 @@ import { BtnAdicionarPage } from './btn-adicionar.page';
IonicModule,
BtnAdicionarPageRoutingModule
],
declarations: [BtnAdicionarPage]
declarations: []
})
export class BtnAdicionarPageModule {}
@@ -15,6 +15,6 @@ import { BtnCriarPage } from './btn-criar.page';
IonicModule,
BtnCriarPageRoutingModule
],
declarations: [BtnCriarPage]
declarations: []
})
export class BtnCriarPageModule {}
@@ -18,6 +18,6 @@ import { ComponentsModule } from 'src/app/components/components.module';
ComponentsModule,
EditGroupPageRoutingModule
],
declarations: [EditGroupPage]
declarations: []
})
export class EditGroupPageModule {}
@@ -15,6 +15,6 @@ import { EmptyChatPage } from './empty-chat.page';
IonicModule,
EmptyChatPageRoutingModule
],
declarations: [EmptyChatPage]
declarations: []
})
export class EmptyChatPageModule {}
@@ -20,6 +20,6 @@ import { ComponentsModule } from 'src/app/components/components.module';
PipesModule,
GroupContactsPageRoutingModule
],
declarations: [GroupContactsPage]
declarations: []
})
export class GroupContactsPageModule {}
@@ -20,6 +20,6 @@ import { ComponentsModule } from 'src/app/components/components.module';
PopoverModule,
GroupMessagesPageRoutingModule
],
declarations: [GroupMessagesPage]
declarations: []
})
export class GroupMessagesPageModule {}
@@ -20,6 +20,6 @@ import { ComponentsModule } from 'src/app/components/components.module';
ContactsPageRoutingModule
],
exports: [FilterPipe],
declarations: [ContactsPage, FilterPipe]
declarations: []
})
export class ContactsPageModule {}
@@ -18,7 +18,6 @@ import { ComponentsModule } from 'src/app/components/components.module';
ComponentsModule,
MessagesPageRoutingModule
],
declarations: [MessagesPage],
exports: [MessagesPage]
declarations: []
})
export class MessagesPageModule {}
@@ -18,6 +18,6 @@ import { ComponentsModule } from 'src/app/components/components.module';
ComponentsModule,
NewGroupPageRoutingModule
],
declarations: [NewGroupPage]
declarations: []
})
export class NewGroupPageModule {}
@@ -15,6 +15,6 @@ import { EmptyContainerPage } from './empty-container.page';
IonicModule,
EmptyContainerPageRoutingModule
],
declarations: [EmptyContainerPage]
declarations: []
})
export class EmptyContainerPageModule {}
@@ -15,6 +15,6 @@ import { AttendeeModalPage } from './attendee-modal.page';
IonicModule,
AttendeeModalPageRoutingModule
],
declarations: [AttendeeModalPage]
declarations: []
})
export class AttendeeModalPageModule {}
@@ -15,6 +15,6 @@ import { AttendeesPage } from './attendees.page';
IonicModule,
AttendeesPageRoutingModule
],
declarations: [AttendeesPage]
declarations: []
})
export class AttendeesPageModule {}
@@ -15,6 +15,6 @@ import { DespachosPrPage } from './despachos-pr.page';
IonicModule,
DespachosPrPageRoutingModule
],
declarations: [DespachosPrPage]
declarations: []
})
export class DespachosPrPageModule {}
@@ -15,6 +15,6 @@ import { DespachosPage } from './despachos.page';
IonicModule,
DespachosPageRoutingModule
],
declarations: [DespachosPage]
declarations: []
})
export class DespachosPageModule {}
@@ -15,6 +15,6 @@ import { DiplomasAssinarPage } from './diplomas-assinar.page';
IonicModule,
DiplomasAssinarPageRoutingModule
],
declarations: [DiplomasAssinarPage]
declarations: []
})
export class DiplomasAssinarPageModule {}
@@ -2,7 +2,7 @@
<div class="title">
<div class="thetitle"><ion-label >Diplomas</ion-label></div>
<div class="theicon">
<button class="btn-no-color" (click)="doRefresh($event)">
<button class="btn-no-color" (click)="doRefresh()">
<ion-icon slot="end" class="title-icon" name="reload-circle"></ion-icon>
</button>
</div>
@@ -19,7 +19,7 @@
</ion-toolbar>
</ion-header>
<ion-content>
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh()">
<ion-refresher-content
pullingIcon="chevron-down-circle-outline"
pullingText="deslize para actualizar"
@@ -16,8 +16,7 @@ import { AttendeeModalPage } from 'src/app/shared/event/attendee-modal/attendee-
EditEventToApproveComponentRoutingModule
],
declarations: [
EditEventToApproveComponent,
AttendeeModalPage
EditEventToApproveComponent
]
})
export class EditEventToApproveComponentModule {}
@@ -15,6 +15,6 @@ import { EventsToApprovePage } from './events-to-approve.page';
IonicModule,
EventsToApprovePageRoutingModule
],
declarations: [EventsToApprovePage]
declarations: []
})
export class EventsToApprovePageModule {}
@@ -18,7 +18,7 @@ import { ComponentsModule } from 'src/app/components/components.module';
ComponentsModule,
ExpedientePageRoutingModule
],
declarations: [ExpedientePage],
declarations: [],
schemas: [CUSTOM_ELEMENTS_SCHEMA]
})
export class ExpedientePageModule {}
@@ -15,6 +15,6 @@ import { ExpedientesPrPage } from './expedientes-pr.page';
IonicModule,
ExpedientesPrPageRoutingModule
],
declarations: [ExpedientesPrPage]
declarations: []
})
export class ExpedientesPrPageModule {}
@@ -15,6 +15,6 @@ import { ExpedientsPage } from './expedients.page';
IonicModule,
ExpedientsPageRoutingModule
],
declarations: [ExpedientsPage]
declarations: []
})
export class ExpedientsPageModule {}
@@ -15,6 +15,6 @@ import { PedidosPage } from './pedidos.page';
IonicModule,
PedidosPageRoutingModule
],
declarations: [PedidosPage]
declarations: []
})
export class PedidosPageModule {}
@@ -15,6 +15,6 @@ import { PendentesPage } from './pendentes.page';
IonicModule,
PendentesPageRoutingModule
],
declarations: [PendentesPage]
declarations: []
})
export class PendentesPageModule {}
@@ -15,6 +15,6 @@ import { ChatPopoverPage } from './chat-popover.page';
IonicModule,
ChatPopoverPageRoutingModule
],
declarations: [ChatPopoverPage]
declarations: []
})
export class ChatPopoverPageModule {}
@@ -15,8 +15,6 @@ import { ChatPopoverPage } from './chat-popover.page';
ChatPopoverPage,
],
entryComponents:[],
declarations: [
ChatPopoverPage,
]
declarations: []
})
export class PopoverModule {}
@@ -59,7 +59,7 @@ export class OptsExpedientePage implements OnInit {
});
}
async openBookMeetingModal(task: any) {
async openBookMeetingModal() {
let classs;
if( window.innerWidth <= 800){
classs = 'book-meeting-modal modal modal-desktop'