This commit is contained in:
tiago.kayaya
2021-06-03 10:41:25 +01:00
parent 462a68fce4
commit 6ab7e3dc03
15 changed files with 45 additions and 59 deletions
+8 -7
View File
@@ -37,6 +37,7 @@ 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';
import { ChatPopoverPageModule } from '../shared/popover/chat-popover/chat-popover.module';
@@ -49,10 +50,10 @@ import { DiplomasAssinarPage } from '../shared/gabinete-digital/diplomas-assinar
BtnCriarPage,
BtnAdicionarPage,
ViewPublicationsPage,
/* ViewPublicationsPage,
NewPublicationPage,
PublicationDetailPage,
NewActionPage,
NewActionPage, */
NewEventPage,
EditEventComponent,
@@ -91,10 +92,10 @@ import { DiplomasAssinarPage } from '../shared/gabinete-digital/diplomas-assinar
BtnCriarPage,
BtnAdicionarPage,
ViewPublicationsPage,
/* ViewPublicationsPage,
NewPublicationPage,
PublicationDetailPage,
NewActionPage,
PublicationDetailPage, */
//NewActionPage,
NewEventPage,
EditEventComponent,
@@ -112,7 +113,7 @@ import { DiplomasAssinarPage } from '../shared/gabinete-digital/diplomas-assinar
EditGroupPage,
GroupContactsPage,
EmptyChatPage,
ChatPopoverPage,
//ChatPopoverPage,
EventListComponent,
EmptyContainerPage,
@@ -129,7 +130,7 @@ import { DiplomasAssinarPage } from '../shared/gabinete-digital/diplomas-assinar
DiplomasAssinarPage
],
imports: [
CommonModule
CommonModule,
]
})
export class ComponentsModule { }
@@ -8,8 +8,8 @@ import { IonicModule } from '@ionic/angular';
import { GroupMessagesPageRoutingModule } from './group-messages-routing.module';
import { GroupMessagesPage } from './group-messages.page';
import { PopoverModule } from 'src/app/shared/popover/chat-popover/popover.modules';
import { ComponentsModule } from 'src/app/components/components.module';
import { ChatPopoverPageModule } from 'src/app/shared/popover/chat-popover/chat-popover.module';
@NgModule({
imports: [
@@ -18,7 +18,7 @@ import { ComponentsModule } from 'src/app/components/components.module';
FormsModule,
IonicModule,
ComponentsModule,
PopoverModule,
ChatPopoverPageModule,
GroupMessagesPageRoutingModule
],
declarations: [GroupMessagesPage]
@@ -13,6 +13,10 @@ import { NewPublicationPage } from 'src/app/shared/publication/new-publication/n
import { PublicationDetailPage } from 'src/app/shared/publication/view-publications/publication-detail/publication-detail.page';
import { NewActionPage } from 'src/app/shared/publication/new-action/new-action.page';
import { ComponentsModule } from 'src/app/components/components.module';
import { ViewPublicationsPageModule } from 'src/app/shared/publication/view-publications/view-publications.module';
import { NewPublicationPageModule } from 'src/app/shared/publication/new-publication/new-publication.module';
import { NewActionPageModule } from 'src/app/shared/publication/new-action/new-action.module';
import { PublicationDetailPageModule } from 'src/app/shared/publication/view-publications/publication-detail/publication-detail.module';
@NgModule({
@@ -21,7 +25,11 @@ import { ComponentsModule } from 'src/app/components/components.module';
FormsModule,
IonicModule,
ComponentsModule,
PublicationsPageRoutingModule
PublicationsPageRoutingModule,
ViewPublicationsPageModule,
NewPublicationPageModule,
PublicationDetailPageModule,
NewActionPageModule,
],
declarations: [
PublicationsPage,
@@ -7,12 +7,14 @@ import { IonicModule } from '@ionic/angular';
import { ViewPublicationsPageRoutingModule } from './view-publications-routing.module';
import { ViewPublicationsPage } from './view-publications.page';
import { ComponentsModule } from 'src/app/components/components.module';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
ViewPublicationsPageRoutingModule
],
declarations: []
@@ -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,7 +17,7 @@ import { ComponentsModule } from 'src/app/components/components.module';
FormsModule,
IonicModule,
ComponentsModule,
PopoverModule,
ChatPopoverPageModule,
GroupMessagesPageRoutingModule
],
declarations: []
@@ -1,4 +1,4 @@
import { NgModule } from '@angular/core';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { IonicModule } from '@ionic/angular';
@@ -6,18 +6,20 @@ import { IonicModule } from '@ionic/angular';
import { EditEventToApproveComponentRoutingModule } from './edit-event-routing.module';
import { EditEventToApproveComponent } from './edit-event.page';
import { AttendeeModalPage } from 'src/app/shared/event/attendee-modal/attendee-modal.page';
import { ComponentsModule } from 'src/app/components/components.module';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
EditEventToApproveComponentRoutingModule
],
declarations: [
EditEventToApproveComponent
]
],
schemas: [CUSTOM_ELEMENTS_SCHEMA]
})
export class EditEventToApproveComponentModule {}
@@ -1,4 +1,4 @@
import { NgModule } from '@angular/core';
import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
@@ -7,14 +7,17 @@ import { IonicModule } from '@ionic/angular';
import { ChatPopoverPageRoutingModule } from './chat-popover-routing.module';
import { ChatPopoverPage } from './chat-popover.page';
import { ComponentsModule } from 'src/app/components/components.module';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
ChatPopoverPageRoutingModule
],
declarations: []
declarations: [ChatPopoverPage],
schemas: [CUSTOM_ELEMENTS_SCHEMA]
})
export class ChatPopoverPageModule {}
@@ -1,6 +1,5 @@
import { Component, OnInit } from '@angular/core';
import { ModalController, NavParams, PopoverController } from '@ionic/angular';
import { EditGroupPage } from 'src/app/pages/chat/edit-group/edit-group.page';
import { ChatService } from 'src/app/services/chat.service';
@Component({
@@ -84,20 +83,6 @@ export class ChatPopoverPage implements OnInit {
async openChangeGroupName(){
this.modalController.dismiss('edit');
/* const modal = await this.modalController.create({
component: EditGroupPage,
componentProps: {
roomId: this.roomId,
},
cssClass: 'contacts',
backdropDismiss: false
});
await modal.present();
modal.onDidDismiss().then((res)=>{
console.log(res.data);
this.modalController.dismiss(res.data);
}); */
}
}
@@ -1,20 +0,0 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { IonicModule } from '@ionic/angular';
import { ChatPopoverPage } from './chat-popover.page';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
],
exports: [
ChatPopoverPage,
],
entryComponents:[],
declarations: []
})
export class PopoverModule {}
@@ -7,12 +7,14 @@ import { IonicModule } from '@ionic/angular';
import { OptsExpedientePageRoutingModule } from './opts-expediente-routing.module';
import { OptsExpedientePage } from './opts-expediente.page';
import { ComponentsModule } from 'src/app/components/components.module';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
ComponentsModule,
OptsExpedientePageRoutingModule
],
declarations: [OptsExpedientePage]
@@ -15,6 +15,7 @@ import { NewActionPage } from './new-action.page';
IonicModule,
NewActionPageRoutingModule
],
declarations: []
exports: [NewActionPage],
declarations: [NewActionPage]
})
export class NewActionPageModule {}
@@ -15,6 +15,7 @@ import { NewPublicationPage } from './new-publication.page';
IonicModule,
NewPublicationPageRoutingModule
],
declarations: []
exports: [NewPublicationPage],
declarations: [NewPublicationPage]
})
export class NewPublicationPageModule {}
@@ -15,6 +15,7 @@ import { PublicationDetailPage } from './publication-detail.page';
IonicModule,
PublicationDetailPageRoutingModule
],
declarations: []
exports: [PublicationDetailPage],
declarations: [PublicationDetailPage]
})
export class PublicationDetailPageModule {}
@@ -5,8 +5,7 @@ import { FormsModule } from '@angular/forms';
import { IonicModule } from '@ionic/angular';
import { ViewPublicationsPageRoutingModule } from './view-publications-routing.module';
import { ViewPublicationsPage } from 'src/app/pages/publications/view-publications/view-publications.page';
import { ViewPublicationsPage } from './view-publications.page';
@NgModule({
imports: [
@@ -15,6 +14,7 @@ import { ViewPublicationsPage } from 'src/app/pages/publications/view-publicatio
IonicModule,
ViewPublicationsPageRoutingModule
],
declarations: []
exports: [ViewPublicationsPage],
declarations: [ViewPublicationsPage]
})
export class ViewPublicationsPageModule {}
@@ -109,7 +109,7 @@ export class ViewPublicationsPage implements OnInit {
}
async AddPublication(publicationType:any, folderId:string) {
async AddPublication(publicationType:any, folderId:any) {
if( window.innerWidth <= 1024) {
const modal = await this.modalController.create({