From 878279bb78da896a81432557e4e11620e9b84c69 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 3 Jun 2021 11:36:14 +0100 Subject: [PATCH 1/4] Improve --- src/app/pages/gabinete-digital/gabinete-digital.module.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/app/pages/gabinete-digital/gabinete-digital.module.ts b/src/app/pages/gabinete-digital/gabinete-digital.module.ts index 1edf1c4e8..4e4cac560 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.module.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.module.ts @@ -24,13 +24,18 @@ import { SignedDiplomaComponent } from 'src/app/shared/gabinete-digital/signed-d import { DiplomasAssinarPage } from 'src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page'; import { ComponentsModule } from 'src/app/components/components.module'; + +import { HeaderPageModule } from 'src/app/shared/header/header.module'; + @NgModule({ imports: [ CommonModule, FormsModule, IonicModule, ComponentsModule, - GabineteDigitalPageRoutingModule + GabineteDigitalPageRoutingModule, + // entries + HeaderPageModule ], declarations: [ GabineteDigitalPage From 646172eb93aa4f7a2bf87b407d9df4673fe1b925 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 3 Jun 2021 11:44:32 +0100 Subject: [PATCH 2/4] Recreate modal --- .../new-event/new-event-routing.module.ts | 17 ++ .../agenda/new-event/new-event.component.html | 230 ------------------ .../agenda/new-event/new-event.component.scss | 213 ---------------- .../agenda/new-event/new-event.module.ts | 20 ++ .../agenda/new-event/new-event.page.html | 9 + .../agenda/new-event/new-event.page.scss | 213 ++++++++++++++++ ...mponent.spec.ts => new-event.page.spec.ts} | 6 +- ...w-event.component.ts => new-event.page.ts} | 9 +- 8 files changed, 268 insertions(+), 449 deletions(-) create mode 100644 src/app/shared/agenda/new-event/new-event-routing.module.ts delete mode 100644 src/app/shared/agenda/new-event/new-event.component.html delete mode 100644 src/app/shared/agenda/new-event/new-event.component.scss create mode 100644 src/app/shared/agenda/new-event/new-event.module.ts create mode 100644 src/app/shared/agenda/new-event/new-event.page.html create mode 100644 src/app/shared/agenda/new-event/new-event.page.scss rename src/app/shared/agenda/new-event/{new-event.component.spec.ts => new-event.page.spec.ts} (75%) rename src/app/shared/agenda/new-event/{new-event.component.ts => new-event.page.ts} (99%) diff --git a/src/app/shared/agenda/new-event/new-event-routing.module.ts b/src/app/shared/agenda/new-event/new-event-routing.module.ts new file mode 100644 index 000000000..1b0103232 --- /dev/null +++ b/src/app/shared/agenda/new-event/new-event-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { NewEventPage } from './new-event.page'; + +const routes: Routes = [ + { + path: '', + component: NewEventPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class NewEventPageRoutingModule {} diff --git a/src/app/shared/agenda/new-event/new-event.component.html b/src/app/shared/agenda/new-event/new-event.component.html deleted file mode 100644 index 30169bfa0..000000000 --- a/src/app/shared/agenda/new-event/new-event.component.html +++ /dev/null @@ -1,230 +0,0 @@ - - -
-
-
- Novo Evento -
-
-
- - - - -
-
- -
-
-
-
- -
-
- -
-
- - - -
- -
-
-
- -
-
- - Oficial - Pessoal - -
-
-
- -
-
-
- -
-
- - Reunião - Viagem - Conferência - Encontro - -
-
-
- -
-
-
- -
-
- - - -
-
-
- -
-
-
- -
-
- - - -
-
-
- -
-
-
- -
-
- - Não se repete - Repete - -
-
-
- -
-
-
- -
-
- -
- - - Adicionar intervenientes - {{participant.Name}} - - -
- -
- -
-
-
-
- -
-
-
- -
-
-
- - - - Com conhecimento - {{participant.Name}} - - - -
-
- -
-
-
-
- -
-
-
- -
-
- - - -
-
-
- -
- -
- -
-
- Adicionar documentos -
- -
- -
- - - -

- {{document.Assunto}} - {{document.appName}} - - - -

-

{{document.EntidadeOrganicaNome}} {{document.Data | date: 'dd-MM-yy'}}

- - - -
- -
- - - - - - Cancelar - - - - - - Gravar - - - - \ No newline at end of file diff --git a/src/app/shared/agenda/new-event/new-event.component.scss b/src/app/shared/agenda/new-event/new-event.component.scss deleted file mode 100644 index 1497762a9..000000000 --- a/src/app/shared/agenda/new-event/new-event.component.scss +++ /dev/null @@ -1,213 +0,0 @@ -ion-content{ - --background:transparent; -} -.header-toolbar{ - --background:transparent; - --opacity: 1; -} -.main-header{ - width: 100%; /* 400px */ - height: 100%; - font-family: Roboto; - border-top-left-radius: 25px; - border-top-right-radius: 25px; - background-color: #fff; - overflow:hidden; - padding: 30px 20px 0px 20px; - color:#000; - transform: translate3d(0, 1px, 0); - - .title-content{ - margin: 0px auto; - overflow: auto; - padding: 0 !important; - background: #fff; - .middle{ - padding: 0!important; - float: left; - width: 221px; - margin: 2.5px 0 0 5px; - } - } - - .title{ - font-size: 25px; - } - -} -.main-content{ - width: 100%; /* 400px */ - height: 100%; - font-family: Roboto; - margin: 0 auto; - background-color: #fff; - overflow:auto; - padding: 15px 20px 0 20px; - - .ion-item-container{ - margin: 15px auto; - border: 1px solid #ebebeb; - border-radius: 5px; - padding-left: 10px; - } - .ion-item-container-no-border{ - width: 100%; - margin: 0px auto; - padding: 0 !important; - overflow: auto; - } - .container-div{ - margin-bottom: 15px; - } - .ion-item-class-2{ - margin: 0px auto; - } - .ion-icon-class{ - width: 45px; - height: 45px; - float: left; - padding: 10px; - font-size: 25px; - } - ion-select{ - padding-left: 5px; - margin-left: 0; - } - .ion-input-class{ - height: 45px; - border: 1px solid #ebebeb; - border-radius: 5px; - padding-left: 5px; - padding-right: 10px; - float: left; - } - .ion-input-class-no-height{ - border: 1px solid #ebebeb; - border-radius: 5px; - overflow: auto; - } - .list-people{ - width: 256px; - float: left; - - } - .add-people{ - width: 45px; - float: right; - overflow: auto; - font-size: 25px; - padding: 10px; - } - .list-people-title{ - /* font-size: 13px; */ - color: #797979; - } - .attach-document{ - font-size: 15px; - color: #0d89d1; - margin: 5px 5px 5px 10px; - padding: 5px; - float: left; - } - .attach-icon{ - width: 37px; - font-size: 35px; - float: left; - } - .attach-title-item{ - width: 100%; - font-size: 15px; - color:#0d89d1; - } - /* SPAN */ - .span-left{ - float: left; - font-size: 15x; - } - .span-right{ - text-align: right; - float: right; - font-size: 13px; - } - .container-footer{ - margin:0 auto; - overflow: auto; - } - .button-cancel { - width: 170px; - height: 44px; - border-radius: 22.5px; - --background: #e0e9ee; - --color: #061b52; - margin:10px; - } - .button-save { - width: 170px; - height: 44px; - border-radius: 22.5px; - --background: #42b9fe; - --color:#ffffff; - margin:10px; - } - - .text-input{ - width: 100%; - border: 1px solid #ebebeb; - margin: 0px 15px 15px 0px; - padding: 0 !important; - border-radius: 5px; - } - - /* Error Messages */ - .error{ - color:red; - font-size: 12px; - font-weight: bold; - padding-bottom: 20px; - } - .span-color{ - color:red; - } - -} - - -.container-div{ - ion-textarea{ - height: 81px; - } -} - - -.app-name{ - background: #42b9f2; - border-radius: 18px; - text-align: center; - display: flex; - align-items: center; - padding: 0px 5px; - color: white; - font-size: 9pt; - font-weight: 500; - height: 19px; - -webkit-border-radius: 18px; - -moz-border-radius: 18px; - -ms-border-radius: 18px; - -o-border-radius: 18px; -} - - -.close-button { - display: none; -} - -.list:hover { - - .app-name { - display: none; - } - - .close-button { - display: block !important; - } -} \ No newline at end of file diff --git a/src/app/shared/agenda/new-event/new-event.module.ts b/src/app/shared/agenda/new-event/new-event.module.ts new file mode 100644 index 000000000..f5d90c691 --- /dev/null +++ b/src/app/shared/agenda/new-event/new-event.module.ts @@ -0,0 +1,20 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; + +import { IonicModule } from '@ionic/angular'; + +import { NewEventPageRoutingModule } from './new-event-routing.module'; + +import { NewEventPage } from './new-event.page'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + NewEventPageRoutingModule + ], + declarations: [NewEventPage] +}) +export class NewEventPageModule {} diff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html new file mode 100644 index 000000000..626888e59 --- /dev/null +++ b/src/app/shared/agenda/new-event/new-event.page.html @@ -0,0 +1,9 @@ + + + NewEvent + + + + + + diff --git a/src/app/shared/agenda/new-event/new-event.page.scss b/src/app/shared/agenda/new-event/new-event.page.scss new file mode 100644 index 000000000..29ce5055c --- /dev/null +++ b/src/app/shared/agenda/new-event/new-event.page.scss @@ -0,0 +1,213 @@ +ion-content{ + --background:transparent; + } + .header-toolbar{ + --background:transparent; + --opacity: 1; + } + .main-header{ + width: 100%; /* 400px */ + height: 100%; + font-family: Roboto; + border-top-left-radius: 25px; + border-top-right-radius: 25px; + background-color: #fff; + overflow:hidden; + padding: 30px 20px 0px 20px; + color:#000; + transform: translate3d(0, 1px, 0); + + .title-content{ + margin: 0px auto; + overflow: auto; + padding: 0 !important; + background: #fff; + .middle{ + padding: 0!important; + float: left; + width: 221px; + margin: 2.5px 0 0 5px; + } + } + + .title{ + font-size: 25px; + } + + } + .main-content{ + width: 100%; /* 400px */ + height: 100%; + font-family: Roboto; + margin: 0 auto; + background-color: #fff; + overflow:auto; + padding: 15px 20px 0 20px; + + .ion-item-container{ + margin: 15px auto; + border: 1px solid #ebebeb; + border-radius: 5px; + padding-left: 10px; + } + .ion-item-container-no-border{ + width: 100%; + margin: 0px auto; + padding: 0 !important; + overflow: auto; + } + .container-div{ + margin-bottom: 15px; + } + .ion-item-class-2{ + margin: 0px auto; + } + .ion-icon-class{ + width: 45px; + height: 45px; + float: left; + padding: 10px; + font-size: 25px; + } + ion-select{ + padding-left: 5px; + margin-left: 0; + } + .ion-input-class{ + height: 45px; + border: 1px solid #ebebeb; + border-radius: 5px; + padding-left: 5px; + padding-right: 10px; + float: left; + } + .ion-input-class-no-height{ + border: 1px solid #ebebeb; + border-radius: 5px; + overflow: auto; + } + .list-people{ + width: 256px; + float: left; + + } + .add-people{ + width: 45px; + float: right; + overflow: auto; + font-size: 25px; + padding: 10px; + } + .list-people-title{ + /* font-size: 13px; */ + color: #797979; + } + .attach-document{ + font-size: 15px; + color: #0d89d1; + margin: 5px 5px 5px 10px; + padding: 5px; + float: left; + } + .attach-icon{ + width: 37px; + font-size: 35px; + float: left; + } + .attach-title-item{ + width: 100%; + font-size: 15px; + color:#0d89d1; + } + /* SPAN */ + .span-left{ + float: left; + font-size: 15x; + } + .span-right{ + text-align: right; + float: right; + font-size: 13px; + } + .container-footer{ + margin:0 auto; + overflow: auto; + } + .button-cancel { + width: 170px; + height: 44px; + border-radius: 22.5px; + --background: #e0e9ee; + --color: #061b52; + margin:10px; + } + .button-save { + width: 170px; + height: 44px; + border-radius: 22.5px; + --background: #42b9fe; + --color:#ffffff; + margin:10px; + } + + .text-input{ + width: 100%; + border: 1px solid #ebebeb; + margin: 0px 15px 15px 0px; + padding: 0 !important; + border-radius: 5px; + } + + /* Error Messages */ + .error{ + color:red; + font-size: 12px; + font-weight: bold; + padding-bottom: 20px; + } + .span-color{ + color:red; + } + + } + + + .container-div{ + ion-textarea{ + height: 81px; + } + } + + + .app-name{ + background: #42b9f2; + border-radius: 18px; + text-align: center; + display: flex; + align-items: center; + padding: 0px 5px; + color: white; + font-size: 9pt; + font-weight: 500; + height: 19px; + -webkit-border-radius: 18px; + -moz-border-radius: 18px; + -ms-border-radius: 18px; + -o-border-radius: 18px; + } + + + .close-button { + display: none; + } + + .list:hover { + + .app-name { + display: none; + } + + .close-button { + display: block !important; + } + } \ No newline at end of file diff --git a/src/app/shared/agenda/new-event/new-event.component.spec.ts b/src/app/shared/agenda/new-event/new-event.page.spec.ts similarity index 75% rename from src/app/shared/agenda/new-event/new-event.component.spec.ts rename to src/app/shared/agenda/new-event/new-event.page.spec.ts index 2930af086..ca95e3857 100644 --- a/src/app/shared/agenda/new-event/new-event.component.spec.ts +++ b/src/app/shared/agenda/new-event/new-event.page.spec.ts @@ -1,13 +1,13 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; import { IonicModule } from '@ionic/angular'; -import { NewEventPage } from './new-event.component'; +import { NewEventPage } from './new-event.page'; describe('NewEventPage', () => { let component: NewEventPage; let fixture: ComponentFixture; - beforeEach(async(() => { + beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ declarations: [ NewEventPage ], imports: [IonicModule.forRoot()] diff --git a/src/app/shared/agenda/new-event/new-event.component.ts b/src/app/shared/agenda/new-event/new-event.page.ts similarity index 99% rename from src/app/shared/agenda/new-event/new-event.component.ts rename to src/app/shared/agenda/new-event/new-event.page.ts index 20d667c51..74acd2072 100644 --- a/src/app/shared/agenda/new-event/new-event.component.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -11,14 +11,16 @@ import { SearchDocument } from "src/app/models/search-document"; import { EventAttachment } from 'src/app/models/attachment.model'; import { BadRequestComponent } from '../../popover/bad-request/bad-request.component'; import { SuccessMessageComponent } from '../../popover/success-message/success-message.component'; + + @Component({ selector: 'app-new-event', - templateUrl: './new-event.component.html', - styleUrls: ['./new-event.component.scss'], + templateUrl: './new-event.page.html', + styleUrls: ['./new-event.page.scss'], }) - export class NewEventPage implements OnInit { + eventBody: EventBody; segment:string = "true"; @@ -345,4 +347,5 @@ export class NewEventPage implements OnInit { },3000) } + } From 766946454f477d0a92de9355829f659f0be2fbce Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 3 Jun 2021 11:52:33 +0100 Subject: [PATCH 3/4] fixe Attendess modal --- .../agenda/new-event/new-event.page.html | 227 +++++++++++++++++- 1 file changed, 224 insertions(+), 3 deletions(-) diff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html index 626888e59..30169bfa0 100644 --- a/src/app/shared/agenda/new-event/new-event.page.html +++ b/src/app/shared/agenda/new-event/new-event.page.html @@ -1,9 +1,230 @@ - - - NewEvent + + +
+
+
+ Novo Evento +
+
+
+
+
+ +
+
+
+
+ +
+
+ +
+
+ + + +
+ +
+
+
+ +
+
+ + Oficial + Pessoal + +
+
+
+
+
+
+ +
+
+ + Reunião + Viagem + Conferência + Encontro + +
+
+
+ +
+
+
+ +
+
+ + + +
+
+
+ +
+
+
+ +
+
+ + + +
+
+
+ +
+
+
+ +
+
+ + Não se repete + Repete + +
+
+
+ +
+
+
+ +
+
+ +
+ + + Adicionar intervenientes + {{participant.Name}} + + +
+ +
+ +
+
+
+
+ +
+
+
+ +
+
+
+ + + + Com conhecimento + {{participant.Name}} + + + +
+
+ +
+
+
+
+ +
+
+
+ +
+
+ + + +
+
+
+ +
+ +
+ +
+
+ Adicionar documentos +
+ +
+ +
+ + + +

+ {{document.Assunto}} + {{document.appName}} + + + +

+

{{document.EntidadeOrganicaNome}} {{document.Data | date: 'dd-MM-yy'}}

+ + + +
+ +
+ + + + + Cancelar + + + + + + Gravar + + + + \ No newline at end of file From a56b3a5944773ecc2932286f008cc03472472ef3 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 3 Jun 2021 11:56:01 +0100 Subject: [PATCH 4/4] Improve view event to approve --- src/app/app-routing.module.ts | 273 +++++++++--------- src/app/components/components.module.ts | 12 +- src/app/pages/agenda/agenda.module.ts | 5 +- .../gabinete-digital.module.ts | 4 +- 4 files changed, 148 insertions(+), 146 deletions(-) diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index bfc00f08f..8d0ace252 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,137 +1,140 @@ -import { NgModule } from '@angular/core'; -import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; -import { ChatPage } from './pages/chat/chat.page'; -import { MessagesPage } from './pages/chat/messages/messages.page'; - -const routes: Routes = [ - { - path: '', - loadChildren: () => import('./index/index.module').then(m => m.IndexPageModule) - }, - { - path: '', - loadChildren: () => import('./home/home.module').then( m => m.HomePageModule) - }, - { - 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) - }, - { - path: 'events-to-approve', - loadChildren: () => import('./shared/gabinete-digital/events-to-approve/events-to-approve.module').then( m => m.EventsToApprovePageModule) - }, - { - path: 'expedients', - loadChildren: () => import('./shared/gabinete-digital/expedients/expedients.module').then( m => m.ExpedientsPageModule) - }, - { - path: 'document-detail', - loadChildren: () => import('./modals/document-detail/document-detail.module').then( m => m.DocumentDetailPageModule) - }, - { - path: 'edit-group', - loadChildren: () => import('./shared/chat/edit-group/edit-group.module').then( m => m.EditGroupPageModule) - }, - { - path: 'pedidos', - loadChildren: () => import('./shared/gabinete-digital/pedidos/pedidos.module').then( m => m.PedidosPageModule) - }, - { - path: 'event-list', - loadChildren: () => import('./pages/gabinete-digital/event-list/event-list.module').then(m =>m.EventListPageModule) - }, - { - path: 'despachos', - loadChildren: () => import('./shared/gabinete-digital/despachos/despachos.module').then( m => m.DespachosPageModule) - }, - { - path: 'create-process', - loadChildren: () => import('./modals/create-process/create-process.module').then( m => m.CreateProcessPageModule) - }, - { - path: 'pendentes', - loadChildren: () => import('./shared/gabinete-digital/pendentes/pendentes.module').then( m => m.PendentesPageModule) - }, - { - path: 'delegar', - loadChildren: () => import('./modals/delegar/delegar.module').then( m => m.DelegarPageModule) - }, - { - path: 'add-note', - loadChildren: () => import('./modals/add-note/add-note.module').then( m => m.AddNotePageModule) - }, - { - path: 'dar-parecer', - loadChildren: () => import('./modals/dar-parecer/dar-parecer.module').then( m => m.DarParecerPageModule) - }, - { - path: 'opts-expediente', - loadChildren: () => import('./shared/popover/opts-expediente/opts-expediente.module').then( m => m.OptsExpedientePageModule) - }, - { - path: 'despachos-pr', - loadChildren: () => import('./shared/gabinete-digital/despachos-pr/despachos-pr.module').then( m => m.DespachosPrPageModule) - }, - { - path: 'diplomas', - loadChildren: () => import('./shared/gabinete-digital/diplomas/diplomas.module').then( m => m.DiplomasPageModule) - }, - { - path: 'expedientes-pr', - loadChildren: () => import('./shared/gabinete-digital/expedientes-pr/expedientes-pr.module').then( m => m.ExpedientesPrPageModule) - }, - { - path: 'diplomas-assinar', - loadChildren: () => import('./shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module').then( m => m.DiplomasAssinarPageModule) - }, - { - path: 'opts-expediente-pr', - loadChildren: () => import('./shared/popover/opts-expediente-pr/opts-expediente-pr.module').then( m => m.OptsExpedientePrPageModule) - }, - { - path: 'despachos-options', - loadChildren: () => import('./shared/popover/despachos-options/despachos-options.module').then( m => m.DespachosOptionsPageModule) - }, - { - path: 'despachos-pr-options', - loadChildren: () => import('./shared/popover/despachos-pr-options/despachos-pr-options.module').then( m => m.DespachosPrOptionsPageModule) - }, - { - path: 'deploma-options', - loadChildren: () => import('./shared/popover/deploma-options/deploma-options.module').then( m => m.DeplomaOptionsPageModule) - }, - { - path: 'pin', - loadChildren: () => import('./shared/pin/pin.module').then( m => m.PinPageModule) - }, - { - path: 'fingerprint', - loadChildren: () => import('./shared/fingerprint/fingerprint.module').then( m => m.FingerprintPageModule) +import { NgModule } from '@angular/core'; +import { PreloadAllModules, RouterModule, Routes } from '@angular/router'; +import { ChatPage } from './pages/chat/chat.page'; +import { MessagesPage } from './pages/chat/messages/messages.page'; + +const routes: Routes = [ + { + path: '', + loadChildren: () => import('./index/index.module').then(m => m.IndexPageModule) + }, + { + path: '', + loadChildren: () => import('./home/home.module').then( m => m.HomePageModule) + }, + { + 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) + }, + { + path: 'events-to-approve', + loadChildren: () => import('./shared/gabinete-digital/events-to-approve/events-to-approve.module').then( m => m.EventsToApprovePageModule) + }, + { + path: 'expedients', + loadChildren: () => import('./shared/gabinete-digital/expedients/expedients.module').then( m => m.ExpedientsPageModule) + }, + { + path: 'document-detail', + loadChildren: () => import('./modals/document-detail/document-detail.module').then( m => m.DocumentDetailPageModule) + }, + { + path: 'edit-group', + loadChildren: () => import('./shared/chat/edit-group/edit-group.module').then( m => m.EditGroupPageModule) + }, + { + path: 'pedidos', + loadChildren: () => import('./shared/gabinete-digital/pedidos/pedidos.module').then( m => m.PedidosPageModule) + }, + { + path: 'event-list', + loadChildren: () => import('./pages/gabinete-digital/event-list/event-list.module').then(m =>m.EventListPageModule) + }, + { + path: 'despachos', + loadChildren: () => import('./shared/gabinete-digital/despachos/despachos.module').then( m => m.DespachosPageModule) + }, + { + path: 'create-process', + loadChildren: () => import('./modals/create-process/create-process.module').then( m => m.CreateProcessPageModule) + }, + { + path: 'pendentes', + loadChildren: () => import('./shared/gabinete-digital/pendentes/pendentes.module').then( m => m.PendentesPageModule) + }, + { + path: 'delegar', + loadChildren: () => import('./modals/delegar/delegar.module').then( m => m.DelegarPageModule) + }, + { + path: 'add-note', + loadChildren: () => import('./modals/add-note/add-note.module').then( m => m.AddNotePageModule) + }, + { + path: 'dar-parecer', + loadChildren: () => import('./modals/dar-parecer/dar-parecer.module').then( m => m.DarParecerPageModule) + }, + { + path: 'opts-expediente', + loadChildren: () => import('./shared/popover/opts-expediente/opts-expediente.module').then( m => m.OptsExpedientePageModule) + }, + { + path: 'despachos-pr', + loadChildren: () => import('./shared/gabinete-digital/despachos-pr/despachos-pr.module').then( m => m.DespachosPrPageModule) + }, + { + path: 'diplomas', + loadChildren: () => import('./shared/gabinete-digital/diplomas/diplomas.module').then( m => m.DiplomasPageModule) + }, + { + path: 'expedientes-pr', + loadChildren: () => import('./shared/gabinete-digital/expedientes-pr/expedientes-pr.module').then( m => m.ExpedientesPrPageModule) + }, + { + path: 'diplomas-assinar', + loadChildren: () => import('./shared/gabinete-digital/diplomas-assinar/diplomas-assinar.module').then( m => m.DiplomasAssinarPageModule) + }, + { + path: 'opts-expediente-pr', + loadChildren: () => import('./shared/popover/opts-expediente-pr/opts-expediente-pr.module').then( m => m.OptsExpedientePrPageModule) + }, + { + path: 'despachos-options', + loadChildren: () => import('./shared/popover/despachos-options/despachos-options.module').then( m => m.DespachosOptionsPageModule) + }, + { + path: 'despachos-pr-options', + loadChildren: () => import('./shared/popover/despachos-pr-options/despachos-pr-options.module').then( m => m.DespachosPrOptionsPageModule) + }, + { + path: 'deploma-options', + loadChildren: () => import('./shared/popover/deploma-options/deploma-options.module').then( m => m.DeplomaOptionsPageModule) + }, + { + path: 'pin', + loadChildren: () => import('./shared/pin/pin.module').then( m => m.PinPageModule) + }, + { + 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: 'chat', - component: ChatPage - } */ - -]; -@NgModule({ - imports: [ - RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules }) - ], - exports: [RouterModule] -}) -export class AppRoutingModule {} + + /* { + path: 'chat', + component: ChatPage + } */ + +]; +@NgModule({ + imports: [ + RouterModule.forRoot(routes, { preloadingStrategy: PreloadAllModules }) + ], + exports: [RouterModule] +}) +export class AppRoutingModule {} diff --git a/src/app/components/components.module.ts b/src/app/components/components.module.ts index e57d4720b..1ff04be4b 100644 --- a/src/app/components/components.module.ts +++ b/src/app/components/components.module.ts @@ -7,7 +7,7 @@ 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'; -import { NewEventPage } from '../shared/agenda/new-event/new-event.component'; +import { NewEventPage } from '../shared/agenda/new-event/new-event.page'; import { EditEventComponent } from '../shared/agenda/edit-event/edit-event.component'; import { ViewEventPage } from '../shared/agenda/view-event/view-event.page'; import { EventListComponent } from '../shared/agenda/event-list/event-list.component'; @@ -52,7 +52,7 @@ import { ChatPopoverPageModule } from '../shared/popover/chat-popover/chat-popov //ViewEventPage, ApproveEventComponent, AttendeesPage, - AttendeeModalPage, + //AttendeeModalPage, /* MessagesPage, ContactsPage, @@ -64,7 +64,7 @@ import { ChatPopoverPageModule } from '../shared/popover/chat-popover/chat-popov EventListComponent, EmptyContainerPage, - EventsToApprovePage, + //EventsToApprovePage, ExpedientePage, ExpedientsPage, PedidosPage, @@ -90,8 +90,8 @@ import { ChatPopoverPageModule } from '../shared/popover/chat-popover/chat-popov EventListComponent, ApproveEventComponent, AttendeesPage, - AttendeeModalPage, - EventsToApprovePage, + //AttendeeModalPage, + //EventsToApprovePage, /* MessagesPage, ContactsPage, @@ -104,7 +104,7 @@ import { ChatPopoverPageModule } from '../shared/popover/chat-popover/chat-popov EventListComponent, EmptyContainerPage, - EventsToApprovePage, + //EventsToApprovePage, ExpedientePage, ExpedientsPage, PedidosPage, diff --git a/src/app/pages/agenda/agenda.module.ts b/src/app/pages/agenda/agenda.module.ts index 308264f36..a08c4f9e8 100644 --- a/src/app/pages/agenda/agenda.module.ts +++ b/src/app/pages/agenda/agenda.module.ts @@ -13,7 +13,7 @@ import { CalModalPageModule } from '../cal-modal/cal-modal.module'; import { registerLocaleData } from '@angular/common'; import localeDe from '@angular/common/locales/pt'; import { SharedModule } from 'src/app/shared/shared.module'; -import { NewEventPage } from "src/app/shared/agenda/new-event/new-event.component" +import { NewEventPage } from "src/app/shared/agenda/new-event/new-event.page" import { EditEventComponent } from 'src/app/shared/agenda/edit-event/edit-event.component'; import { ViewEventPage } from 'src/app/shared/agenda/view-event/view-event.page'; import { EventListComponent } from "src/app/shared/agenda/event-list/event-list.component"; @@ -60,9 +60,6 @@ import { ViewEventPageModule } from 'src/app/shared/agenda/view-event/view-event declarations: [ AgendaPage ], - entryComponents: [ - EventsToApprovePage, - ], schemas: [CUSTOM_ELEMENTS_SCHEMA], providers: [ { provide: LOCALE_ID, useValue: 'pt-PT'} diff --git a/src/app/pages/gabinete-digital/gabinete-digital.module.ts b/src/app/pages/gabinete-digital/gabinete-digital.module.ts index 4e4cac560..5eca65132 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.module.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.module.ts @@ -26,6 +26,7 @@ import { ComponentsModule } from 'src/app/components/components.module'; import { HeaderPageModule } from 'src/app/shared/header/header.module'; +import { EventsToApprovePageModule } from 'src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module'; @NgModule({ imports: [ @@ -35,7 +36,8 @@ import { HeaderPageModule } from 'src/app/shared/header/header.module'; ComponentsModule, GabineteDigitalPageRoutingModule, // entries - HeaderPageModule + HeaderPageModule, + EventsToApprovePageModule ], declarations: [ GabineteDigitalPage