From 57d9a7f72f3c8622d514472991502997bd3f3402 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 25 Jun 2021 14:28:53 +0100 Subject: [PATCH] save --- config.xml | 2 +- .../create-process/create-process.page.html | 14 ++-- .../create-process/create-process.page.scss | 2 +- src/app/modals/delegar/delegar.page.ts | 2 - src/app/modals/forward/forward.page.ts | 43 +++++++---- ...dd-participants-cc-modal-routing.module.ts | 17 ----- .../add-participants-cc-modal.module.ts | 20 ------ .../add-participants-cc-modal.page.html | 35 --------- .../add-participants-cc-modal.page.scss | 29 -------- .../add-participants-cc-modal.page.spec.ts | 24 ------- .../add-participants-cc-modal.page.ts | 72 ------------------- .../add-participants-modal-routing.module.ts | 17 ----- .../add-participants-modal.module.ts | 20 ------ .../add-participants-modal.page.html | 36 ---------- .../add-participants-modal.page.scss | 29 -------- .../add-participants-modal.page.spec.ts | 24 ------- .../add-participants-modal.page.ts | 69 ------------------ .../book-meeting-modal.page.html | 20 +++--- .../book-meeting-modal.page.scss | 2 +- .../expedient-task-modal.page.html | 10 +-- .../expedient-task-modal.page.scss | 4 +- .../expediente/expediente-routing.module.ts | 61 +++++++--------- .../expediente-pr/expediente-pr.page.html | 6 +- .../gabinete-digital.page.html | 2 +- 24 files changed, 85 insertions(+), 475 deletions(-) delete mode 100644 src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal-routing.module.ts delete mode 100644 src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.module.ts delete mode 100644 src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page.html delete mode 100644 src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page.scss delete mode 100644 src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page.spec.ts delete mode 100644 src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page.ts delete mode 100644 src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal-routing.module.ts delete mode 100644 src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.module.ts delete mode 100644 src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page.html delete mode 100644 src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page.scss delete mode 100644 src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page.spec.ts delete mode 100644 src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page.ts diff --git a/config.xml b/config.xml index 721c9620c..09d2165cb 100644 --- a/config.xml +++ b/config.xml @@ -134,7 +134,7 @@ 0 - 8.0.0.00-20210308-063916 + 8.0.0.00-20210214-154410 diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html index 40169c9a9..f8260878f 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 @@ {{modalTitle[taskType]}}
- +
@@ -29,15 +29,15 @@
- + Normal (4 dias para a execução da tarefa) Urgente (2 dias para a execução da tarefa) Muito Urgente (1 dia para a execução da tarefa) Urgentíssimo (8 horas para a execução da tarefa) - - + + Normal @@ -63,8 +63,8 @@
- - + + Normal Urgente Muito Urgente @@ -85,7 +85,7 @@
- Adicionar intervenientes + Adicionar intervenientes* {{participant.Name}} diff --git a/src/app/modals/create-process/create-process.page.scss b/src/app/modals/create-process/create-process.page.scss index 8d65f1756..e2a954f25 100644 --- a/src/app/modals/create-process/create-process.page.scss +++ b/src/app/modals/create-process/create-process.page.scss @@ -72,7 +72,7 @@ } .list-people-title{ /* font-size: 13px; */ - color: #797979; + color: #a3a3a3; } .attach-document{ font-size: 15px; diff --git a/src/app/modals/delegar/delegar.page.ts b/src/app/modals/delegar/delegar.page.ts index 2f2b46f6a..b4d74a350 100644 --- a/src/app/modals/delegar/delegar.page.ts +++ b/src/app/modals/delegar/delegar.page.ts @@ -7,8 +7,6 @@ import { ProcessesService } from 'src/app/services/processes.service'; import { EventPerson } from 'src/app/models/eventperson.model'; import { EventsService } from 'src/app/services/events.service'; import { AttachmentsService } from 'src/app/services/attachments.service'; -import { AddParticipantsModalPage } from 'src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page'; -import { AddParticipantsCcModalPage } from 'src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page'; import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page'; import { AlertService } from 'src/app/services/alert.service'; import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page'; diff --git a/src/app/modals/forward/forward.page.ts b/src/app/modals/forward/forward.page.ts index 9ab745dfc..30edfac9e 100644 --- a/src/app/modals/forward/forward.page.ts +++ b/src/app/modals/forward/forward.page.ts @@ -7,8 +7,6 @@ import { ProcessesService } from 'src/app/services/processes.service'; import { EventPerson } from 'src/app/models/eventperson.model'; import { EventsService } from 'src/app/services/events.service'; import { AttachmentsService } from 'src/app/services/attachments.service'; -import { AddParticipantsModalPage } from 'src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page'; -import { AddParticipantsCcModalPage } from 'src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page'; import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page'; import { AlertService } from 'src/app/services/alert.service'; import { BadRequestPage } from 'src/app/shared/popover/bad-request/bad-request.page'; @@ -16,6 +14,7 @@ import { SuccessMessagePage } from 'src/app/shared/popover/success-message/succe import { ToastService } from 'src/app/services/toast.service'; import { SearchDocument } from 'src/app/models/search-document'; import { SearchPage } from 'src/app/pages/search/search.page'; +import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page'; @Component({ selector: 'app-forward', @@ -157,28 +156,44 @@ export class ForwardPage implements OnInit { } } - async addParticipants(){ - console.log('HERE'); - + async addParticipants() { this.adding = "intervenient"; - if(window.innerWidth <= 800){ + if(window.innerWidth <=800) { + this.showAttendees=false; const modal = await this.modalController.create({ - component: AddParticipantsModalPage, - componentProps: { - eventPersons: this.eventAttendees + component: AttendeesPageModal, + componentProps: { + adding: this.adding, + taskParticipants: this.taskParticipants, + taskParticipantsCc: this.taskParticipantsCc }, - cssClass: 'book-meeting-modal', + cssClass: 'modal attendee', backdropDismiss: false }); - + await modal.present(); - - modal.onDidDismiss().then((res) => { + + modal.onDidDismiss().then((data) => { + if(data) { + data = data['data']; + const newAttendees: EventPerson[] = data['taskParticipants']; + const newAttendeesCC: EventPerson[] = data['taskParticipantsCc']; + this.setIntervenient(newAttendees); + this.setIntervenientCC(newAttendeesCC); + } }); } else { - this.showAttendees = true; + this.showAttendees=true } } + + async setIntervenient(data) { + this.taskParticipants = data; + } + + async setIntervenientCC(data) { + this.taskParticipantsCc = data; + } validateFormInputs(){ let formLocation = this.postData.Location.trim(); diff --git a/src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal-routing.module.ts b/src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal-routing.module.ts deleted file mode 100644 index 41b207888..000000000 --- a/src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal-routing.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { AddParticipantsCcModalPage } from './add-participants-cc-modal.page'; - -const routes: Routes = [ - { - path: '', - component: AddParticipantsCcModalPage - } -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule], -}) -export class AddParticipantsCcModalPageRoutingModule {} diff --git a/src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.module.ts b/src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.module.ts deleted file mode 100644 index bc0249591..000000000 --- a/src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.module.ts +++ /dev/null @@ -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 { AddParticipantsCcModalPageRoutingModule } from './add-participants-cc-modal-routing.module'; - -import { AddParticipantsCcModalPage } from './add-participants-cc-modal.page'; - -@NgModule({ - imports: [ - CommonModule, - FormsModule, - IonicModule, - AddParticipantsCcModalPageRoutingModule - ], - declarations: [AddParticipantsCcModalPage] -}) -export class AddParticipantsCcModalPageModule {} diff --git a/src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page.html b/src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page.html deleted file mode 100644 index b4bed4fb0..000000000 --- a/src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page.html +++ /dev/null @@ -1,35 +0,0 @@ - -

Com conhecimento

- - - - - - - - - - - -

{{ attendee.Name }}

-

{{ attendee.EmailAddress }}

- - - - - - - - - - -

- Cancelar -

-

- Gravar -

- - - - diff --git a/src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page.scss b/src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page.scss deleted file mode 100644 index 5e0ed3224..000000000 --- a/src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page.scss +++ /dev/null @@ -1,29 +0,0 @@ -ion-header{ - padding: 20px 20px 0px 20px; -} -ion-content{ - --padding-top: 20px; - --padding-start: 15px; - --padding-end: 20px; -} - -.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; - } \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page.spec.ts b/src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page.spec.ts deleted file mode 100644 index 23481cfde..000000000 --- a/src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { IonicModule } from '@ionic/angular'; - -import { AddParticipantsCcModalPage } from './add-participants-cc-modal.page'; - -describe('AddParticipantsCcModalPage', () => { - let component: AddParticipantsCcModalPage; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ AddParticipantsCcModalPage ], - imports: [IonicModule.forRoot()] - }).compileComponents(); - - fixture = TestBed.createComponent(AddParticipantsCcModalPage); - component = fixture.componentInstance; - fixture.detectChanges(); - })); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page.ts b/src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page.ts deleted file mode 100644 index 07e6b8d65..000000000 --- a/src/app/pages/gabinete-digital/expediente/add-participants-cc-modal/add-participants-cc-modal.page.ts +++ /dev/null @@ -1,72 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { ModalController, NavParams } from '@ionic/angular'; -import { EventPerson } from 'src/app/models/eventperson.model'; -import { ContactsService } from 'src/app/services/contacts.service'; - -@Component({ - selector: 'app-add-participants-cc-modal', - templateUrl: './add-participants-cc-modal.page.html', - styleUrls: ['./add-participants-cc-modal.page.scss'], -}) -export class AddParticipantsCcModalPage implements OnInit { - - contacts: EventPerson[]; - showLoader: boolean = false; - eventPersons: EventPerson[]; - participantsAdded: any; - - constructor(private modalController: ModalController, - private contactsService: ContactsService, - private navParams: NavParams, - ) { - this.participantsAdded = this.navParams.get('eventPersons'); - } - - ngOnInit() { - this.fetchContacts(""); - } - - onChange(evt: any) { - this.fetchContacts(evt.detail.value); - } - - selectContact(itm: EventPerson){ - itm.IsRequired = !itm.IsRequired; - } - - async fetchContacts(filter: string) { - this.showLoader = true; - - this.contactsService.getContacts(filter).subscribe(result => - { - if (this.participantsAdded != null) - { - this.participantsAdded.forEach(attendee => { - const index: number = result.findIndex((cont) => { - return cont.EmailAddress == attendee.UserId - }); - - result.splice(index, 1); - }); - } - this.contacts = result; - this.showLoader = false; - } - ); - } - - cancelTask(){ - this.modalController.dismiss(null); - } - - saveTask(){ - this.modalController.dismiss(this.contacts.filter(function(contact) { - if(contact.IsRequired){ - /* console.log(contact); */ - } - - return contact.IsRequired == true; - })); - } - -} diff --git a/src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal-routing.module.ts b/src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal-routing.module.ts deleted file mode 100644 index f6e6c6ca7..000000000 --- a/src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal-routing.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { AddParticipantsModalPage } from './add-participants-modal.page'; - -const routes: Routes = [ - { - path: '', - component: AddParticipantsModalPage - } -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule], -}) -export class AddParticipantsModalPageRoutingModule {} diff --git a/src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.module.ts b/src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.module.ts deleted file mode 100644 index 7ba6edc49..000000000 --- a/src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.module.ts +++ /dev/null @@ -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 { AddParticipantsModalPageRoutingModule } from './add-participants-modal-routing.module'; - -import { AddParticipantsModalPage } from './add-participants-modal.page'; - -@NgModule({ - imports: [ - CommonModule, - FormsModule, - IonicModule, - AddParticipantsModalPageRoutingModule - ], - declarations: [AddParticipantsModalPage] -}) -export class AddParticipantsModalPageModule {} diff --git a/src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page.html b/src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page.html deleted file mode 100644 index f654a2caa..000000000 --- a/src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page.html +++ /dev/null @@ -1,36 +0,0 @@ - -

Adicionar Intervenientes - TK

- - - - - - - - - - - - -

{{ attendee.Name }}

-

{{ attendee.EmailAddress }}

- - - - - - - - - - - -

- Cancelar -

-

- Gravar -

- - - diff --git a/src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page.scss b/src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page.scss deleted file mode 100644 index 5e0ed3224..000000000 --- a/src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page.scss +++ /dev/null @@ -1,29 +0,0 @@ -ion-header{ - padding: 20px 20px 0px 20px; -} -ion-content{ - --padding-top: 20px; - --padding-start: 15px; - --padding-end: 20px; -} - -.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; - } \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page.spec.ts b/src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page.spec.ts deleted file mode 100644 index 33f7c7d91..000000000 --- a/src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { async, ComponentFixture, TestBed } from '@angular/core/testing'; -import { IonicModule } from '@ionic/angular'; - -import { AddParticipantsModalPage } from './add-participants-modal.page'; - -describe('AddParticipantsModalPage', () => { - let component: AddParticipantsModalPage; - let fixture: ComponentFixture; - - beforeEach(async(() => { - TestBed.configureTestingModule({ - declarations: [ AddParticipantsModalPage ], - imports: [IonicModule.forRoot()] - }).compileComponents(); - - fixture = TestBed.createComponent(AddParticipantsModalPage); - component = fixture.componentInstance; - fixture.detectChanges(); - })); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page.ts b/src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page.ts deleted file mode 100644 index 818795e56..000000000 --- a/src/app/pages/gabinete-digital/expediente/add-participants-modal/add-participants-modal.page.ts +++ /dev/null @@ -1,69 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { ModalController, NavParams } from '@ionic/angular'; -import { EventPerson } from 'src/app/models/eventperson.model'; -import { ContactsService } from 'src/app/services/contacts.service'; - -@Component({ - selector: 'app-add-participants-modal', - templateUrl: './add-participants-modal.page.html', - styleUrls: ['./add-participants-modal.page.scss'], -}) -export class AddParticipantsModalPage implements OnInit { - - contacts: EventPerson[]; - showLoader: boolean = false; - eventPersons: EventPerson[]; - participantsAdded: any; - - constructor(private modalController: ModalController, - private contactsService: ContactsService, - private navParams: NavParams,) { } - - ngOnInit() { - this.fetchContacts(""); - this.participantsAdded = this.navParams.get('eventPersons'); - } - async fetchContacts(filter: string) { - this.showLoader = true; - - this.contactsService.getContacts(filter).subscribe(result => - { - if (this.participantsAdded != null) - { - this.participantsAdded.forEach(attendee => { - const index: number = result.findIndex((cont) => { - return cont.EmailAddress == attendee.UserId - }); - - result.splice(index, 1); - }); - } - this.contacts = result; - this.showLoader = false; - } - ); - } - - onChange(evt: any) { - this.fetchContacts(evt.detail.value); - } - - selectContact(itm: EventPerson){ - itm.IsRequired = !itm.IsRequired; - } - - cancelTask(){ - this.modalController.dismiss(null); - } - - saveTask(){ - this.modalController.dismiss(this.contacts.filter(function(contact) { - if(contact.IsRequired){ - /* console.log(contact); */ - } - - return contact.IsRequired == true; - })); - } - -} diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html index 66633a13e..4de07a3f2 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html @@ -69,7 +69,7 @@
- - + Não se repete @@ -192,7 +192,7 @@
- Adicionar intervenientes + Adicionar intervenientes* {{participant.Name}} diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss index 32c453fd4..7a4a2d624 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss @@ -70,7 +70,7 @@ } .list-people-title{ /* font-size: 13px; */ - color: #797979; + color: #a3a3a3; } .attach-document{ font-size: 15px; 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 6bea75699..14fd82ab1 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 @@ -5,7 +5,7 @@ {{modalTitle[taskType]}}
- +
@@ -29,7 +29,7 @@
@@ -71,9 +72,10 @@ - + {{type.Description}} @@ -90,7 +92,7 @@
- Adicionar intervenientes + Adicionar intervenientes* {{participant.Name}} diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss index 79005ca36..9dc2f577d 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss @@ -73,7 +73,7 @@ } .list-people-title{ /* font-size: 13px; */ - color: #797979; + color: #a3a3a3; } .attach-document{ font-size: 15px; @@ -128,8 +128,6 @@ } } - - .attach-icon{ width: 37px; font-size: 35px; diff --git a/src/app/pages/gabinete-digital/expediente/expediente-routing.module.ts b/src/app/pages/gabinete-digital/expediente/expediente-routing.module.ts index 9ff908043..7bc75d498 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-routing.module.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-routing.module.ts @@ -1,38 +1,31 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { ExpedientePage } from './expediente.page'; - -const routes: Routes = [ - { - path: '', - component: ExpedientePage - }, - { - path: 'expediente-detail', - loadChildren: () => import('./expediente-detail/expediente-detail.module').then( m => m.ExpedienteDetailPageModule) - }, - { - path: 'expedient-task-modal', - loadChildren: () => import('./expedient-task-modal/expedient-task-modal.module').then( m => m.ExpedientTaskModalPageModule) - }, { +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { ExpedientePage } from './expediente.page'; + +const routes: Routes = [ + { + path: '', + component: ExpedientePage + }, + { + path: 'expediente-detail', + loadChildren: () => import('./expediente-detail/expediente-detail.module').then( m => m.ExpedienteDetailPageModule) + }, + { + path: 'expedient-task-modal', + loadChildren: () => import('./expedient-task-modal/expedient-task-modal.module').then( m => m.ExpedientTaskModalPageModule) + }, + { path: 'book-meeting-modal', loadChildren: () => import('./book-meeting-modal/book-meeting-modal.module').then( m => m.BookMeetingModalPageModule) }, - { - path: 'add-participants-modal', - loadChildren: () => import('./add-participants-modal/add-participants-modal.module').then( m => m.AddParticipantsModalPageModule) - }, - { - path: 'add-participants-cc-modal', - loadChildren: () => import('./add-participants-cc-modal/add-participants-cc-modal.module').then( m => m.AddParticipantsCcModalPageModule) - } - -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule], -}) -export class ExpedientePageRoutingModule {} + +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class ExpedientePageRoutingModule {} diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html index 195067a0a..c5f79c42b 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html +++ b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.html @@ -125,7 +125,7 @@
-
+
@@ -160,10 +160,6 @@

- - - -
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 346097d46..93612b97b 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -86,7 +86,7 @@

Despacho do Presidente da República

-

Despacho criados por mim

+

Despachos criados por mim

{{ count_de_pr }} Documentos