diff --git a/src/app/modals/create-process/create-process.module.ts b/src/app/modals/create-process/create-process.module.ts index 966b47509..0283d48a0 100644 --- a/src/app/modals/create-process/create-process.module.ts +++ b/src/app/modals/create-process/create-process.module.ts @@ -9,13 +9,19 @@ 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 { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module'; +import { EmptyContainerPageModule } from 'src/app/shared/empty-container/empty-container.module'; @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, - CreateProcessPageRoutingModule + CreateProcessPageRoutingModule, + + // + AttendeeModalPageModule, + EmptyContainerPageModule ], declarations: [ CreateProcessPage diff --git a/src/app/pages/agenda/agenda.module.ts b/src/app/pages/agenda/agenda.module.ts index 3c5cc9657..06d3a91a7 100644 --- a/src/app/pages/agenda/agenda.module.ts +++ b/src/app/pages/agenda/agenda.module.ts @@ -38,6 +38,7 @@ import { NewEventPageModule } from 'src/app/shared/agenda/new-event/new-event.mo import { EventsToApprovePageModule } from 'src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module'; import { EventListPageModule } from 'src/app/shared/agenda/event-list/event-list.module'; +import { EditEventPageModule } from 'src/app/shared/agenda/edit-event/edit-event.module'; @NgModule({ imports: [ @@ -62,7 +63,8 @@ import { EventListPageModule } from 'src/app/shared/agenda/event-list/event-list EventsToApprovePageModule, ApproveEventPageModule, NewEventPageModule, - EventListPageModule + EventListPageModule, + EditEventPageModule, ], declarations: [ AgendaPage diff --git a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts index 70e16386e..85c8e0df0 100644 --- a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts +++ b/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts @@ -35,8 +35,8 @@ export class EventActionsPopoverPage implements OnInit { closePopover(){ this.popoverController.dismiss(); } - approveTask(serialNumber:string){ - let body = { "serialNumber": serialNumber, "action": "Aprovar" } + approveTask() { + let body = { "serialNumber": this.serialNumber, "action": "Aprovar" } console.log(body); @@ -50,9 +50,9 @@ export class EventActionsPopoverPage implements OnInit { } } - emendarTask(serialNumber:string){ + emendarTask(){ - let body = { "serialNumber": serialNumber, "action": "Rejeitar" } + let body = { "serialNumber": this.serialNumber, "action": "Rejeitar" } console.log(body); diff --git a/src/app/pages/gabinete-digital/create-task/create-task.component.html b/src/app/pages/gabinete-digital/create-task/create-task.component.html deleted file mode 100644 index cb43c5d46..000000000 --- a/src/app/pages/gabinete-digital/create-task/create-task.component.html +++ /dev/null @@ -1,237 +0,0 @@ - - -
-
-
- Novo Evento -
-
-
- - - - -
-
- -
-
-
-
- -
-
- -
-
- - - -
- -
-
-
- -
-
- -
-
-
- -
-
-
- -
-
- -
-
-
- -
-
-
- -
-
- - -
-
-
- -
-
-
- -
-
- - -
-
-
- -
-
-
- -
-
- -
-
-
- -
-
-
- -
-
-
- -
- -
-
-
- - - - - -
-
-
- -
-
- - - -
-
-
- - - - -
- - - - - - - - - - - - \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/create-task/create-task.component.scss b/src/app/pages/gabinete-digital/create-task/create-task.component.scss deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/app/pages/gabinete-digital/create-task/create-task.component.spec.ts b/src/app/pages/gabinete-digital/create-task/create-task.component.spec.ts deleted file mode 100644 index 22f9769b0..000000000 --- a/src/app/pages/gabinete-digital/create-task/create-task.component.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { IonicModule } from '@ionic/angular'; - -import { CreateTaskComponent } from './create-task.component'; - -describe('CreateTaskComponent', () => { - let component: CreateTaskComponent; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ CreateTaskComponent ], - imports: [IonicModule.forRoot()] - }).compileComponents(); - - fixture = TestBed.createComponent(CreateTaskComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - })); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/pages/gabinete-digital/create-task/create-task.component.ts b/src/app/pages/gabinete-digital/create-task/create-task.component.ts deleted file mode 100644 index 19dbd3db8..000000000 --- a/src/app/pages/gabinete-digital/create-task/create-task.component.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { Component, OnInit } from '@angular/core'; - -@Component({ - selector: 'app-create-task', - templateUrl: './create-task.component.html', - styleUrls: ['./create-task.component.scss'], -}) -export class CreateTaskComponent implements OnInit { - - constructor() { } - - ngOnInit() {} - -} diff --git a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html index 776e45e90..737d24541 100644 --- a/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html +++ b/src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.html @@ -18,7 +18,7 @@
- + - + diff --git a/src/app/shared/btn-seguinte/btn-seguinte.module.ts b/src/app/shared/btn-seguinte/btn-seguinte.module.ts index 8bcb566c7..6b635eaac 100644 --- a/src/app/shared/btn-seguinte/btn-seguinte.module.ts +++ b/src/app/shared/btn-seguinte/btn-seguinte.module.ts @@ -7,7 +7,6 @@ import { IonicModule } from '@ionic/angular'; import { BtnSeguintePageRoutingModule } from './btn-seguinte-routing.module'; import { BtnSeguintePage } from './btn-seguinte.page'; - @NgModule({ imports: [ CommonModule,