diff --git a/package-lock.json b/package-lock.json index c740d06fd..50898f4dc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6584,6 +6584,11 @@ "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==" }, + "deepmerge": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", + "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==" + }, "default-gateway": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz", @@ -7124,8 +7129,7 @@ "entities": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz", - "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==", - "dev": true + "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==" }, "env-paths": { "version": "2.2.0", @@ -8353,6 +8357,11 @@ "minimalistic-assert": "^1.0.1" } }, + "he": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", + "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==" + }, "hex-color-regex": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/hex-color-regex/-/hex-color-regex-1.1.0.tgz", @@ -8421,6 +8430,63 @@ "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", "dev": true }, + "html-to-text": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/html-to-text/-/html-to-text-7.0.0.tgz", + "integrity": "sha512-UR/WMSHRN8m+L7qQUhbSoxylwBovNPS+xURn/pHeJvbnemhyMiuPYBTBGqB6s8ajAARN5jzKfF0d3CY86VANpA==", + "requires": { + "deepmerge": "^4.2.2", + "he": "^1.2.0", + "htmlparser2": "^6.0.0", + "minimist": "^1.2.5" + }, + "dependencies": { + "dom-serializer": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.2.0.tgz", + "integrity": "sha512-n6kZFH/KlCrqs/1GHMOd5i2fd/beQHuehKdWvNNffbGHTr/almdhuVvTVFb3V7fglz+nC50fFusu3lY33h12pA==", + "requires": { + "domelementtype": "^2.0.1", + "domhandler": "^4.0.0", + "entities": "^2.0.0" + } + }, + "domelementtype": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.2.0.tgz", + "integrity": "sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==" + }, + "domhandler": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.1.0.tgz", + "integrity": "sha512-/6/kmsGlMY4Tup/nGVutdrK9yQi4YjWVcVeoQmixpzjOUK1U7pQkvAPHBJeUxOgxF0J8f8lwCJSlCfD0V4CMGQ==", + "requires": { + "domelementtype": "^2.2.0" + } + }, + "domutils": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.5.1.tgz", + "integrity": "sha512-hO1XwHMGAthA/1KL7c83oip/6UWo3FlUNIuWiWKltoiQ5oCOiqths8KknvY2jpOohUoUgnwa/+Rm7UpwpSbY/Q==", + "requires": { + "dom-serializer": "^1.0.1", + "domelementtype": "^2.2.0", + "domhandler": "^4.1.0" + } + }, + "htmlparser2": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.0.1.tgz", + "integrity": "sha512-GDKPd+vk4jvSuvCbyuzx/unmXkk090Azec7LovXP8as1Hn8q9p3hbjmDGbUqqhknw0ajwit6LiiWqfiTUPMK7w==", + "requires": { + "domelementtype": "^2.0.1", + "domhandler": "^4.0.0", + "domutils": "^2.4.4", + "entities": "^2.0.0" + } + } + } + }, "htmlparser2": { "version": "3.10.1", "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz", diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 2d637573b..e4573a5ba 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -35,6 +35,10 @@ const routes: Routes = [ 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: 'chat', diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts index 75c242352..34837370e 100644 --- a/src/app/home/home-routing.module.ts +++ b/src/app/home/home-routing.module.ts @@ -76,6 +76,10 @@ const routes: Routes = [ path: 'edit-event', loadChildren: () => import('../pages/agenda/edit-event/edit-event.module').then( m => m.EditEventPageModule) }, + { + path: 'emend-message-modal', + loadChildren: () => import('../pages/agenda/emend-message-modal/emend-message-modal.module').then( m => m.EmendMessageModalPageModule) + }, ] }, { diff --git a/src/app/modals/document-detail/document-detail-routing.module.ts b/src/app/modals/document-detail/document-detail-routing.module.ts new file mode 100644 index 000000000..db1857b89 --- /dev/null +++ b/src/app/modals/document-detail/document-detail-routing.module.ts @@ -0,0 +1,17 @@ +import { NgModule } from '@angular/core'; +import { Routes, RouterModule } from '@angular/router'; + +import { DocumentDetailPage } from './document-detail.page'; + +const routes: Routes = [ + { + path: '', + component: DocumentDetailPage + } +]; + +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule], +}) +export class DocumentDetailPageRoutingModule {} diff --git a/src/app/modals/document-detail/document-detail.module.ts b/src/app/modals/document-detail/document-detail.module.ts new file mode 100644 index 000000000..78eb44eb1 --- /dev/null +++ b/src/app/modals/document-detail/document-detail.module.ts @@ -0,0 +1,24 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import { FormsModule } from '@angular/forms'; + +import { IonicModule } from '@ionic/angular'; + +import { DocumentDetailPageRoutingModule } from './document-detail-routing.module'; + +import { DocumentDetailPage } from './document-detail.page'; +import { SharedModule } from 'src/app/shared/shared.module'; + +@NgModule({ + imports: [ + CommonModule, + FormsModule, + IonicModule, + SharedModule, + DocumentDetailPageRoutingModule + ], + declarations: [ + DocumentDetailPage, + SharedModule,] +}) +export class DocumentDetailPageModule {} diff --git a/src/app/modals/document-detail/document-detail.page.html b/src/app/modals/document-detail/document-detail.page.html new file mode 100644 index 000000000..91323eed8 --- /dev/null +++ b/src/app/modals/document-detail/document-detail.page.html @@ -0,0 +1,10 @@ + + + + document-detail + + + + + + diff --git a/src/app/modals/document-detail/document-detail.page.scss b/src/app/modals/document-detail/document-detail.page.scss new file mode 100644 index 000000000..e69de29bb diff --git a/src/app/modals/document-detail/document-detail.page.spec.ts b/src/app/modals/document-detail/document-detail.page.spec.ts new file mode 100644 index 000000000..d21f72d70 --- /dev/null +++ b/src/app/modals/document-detail/document-detail.page.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { DocumentDetailPage } from './document-detail.page'; + +describe('DocumentDetailPage', () => { + let component: DocumentDetailPage; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ DocumentDetailPage ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(DocumentDetailPage); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/modals/document-detail/document-detail.page.ts b/src/app/modals/document-detail/document-detail.page.ts new file mode 100644 index 000000000..db679b63b --- /dev/null +++ b/src/app/modals/document-detail/document-detail.page.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-document-detail', + templateUrl: './document-detail.page.html', + styleUrls: ['./document-detail.page.scss'], +}) +export class DocumentDetailPage implements OnInit { + + constructor() { } + + ngOnInit() { + } + +} diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 9133595b8..f1cf61d76 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -335,6 +335,7 @@ [profile]="profile" [selectedSegment]=segment [taskParticipants]="taskParticipants" + [taskParticipantsCc]="taskParticipantsCc" [selectedDate]="eventSelectedDate" (onAddEvent)="openAddEventDismiss($event)" (openAttendeesComponent)="openAttendeesComponent($event)" @@ -342,7 +343,9 @@ [eventAttendees]="contacts" (clearContact)="clearContact()" (setContact)="setContact($event)" - + + (setIntervenient)="setIntervenient($event)" + (setIntervenientCC)="setIntervenientCC($event)" > diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 1e7874633..a3fa15391 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -112,7 +112,6 @@ export class AgendaPage implements OnInit { // this will make toggle add event and. showEventEditOrOpen: "edit" | "add" | "" = "" - prEventList: Event[]; mdEventList: Event[] @@ -894,7 +893,8 @@ export class AgendaPage implements OnInit { const modal = await this.modalCtrl.create({ component: ViewEventPage, componentProps:{ - eventId: eventId + eventId: eventId, + adding: this.adding }, cssClass: 'modal modal-desktop', backdropDismiss: false @@ -931,6 +931,7 @@ export class AgendaPage implements OnInit { const modal = await this.modalCtrl.create({ component: EventListPage, componentProps:{ + profile: this.profile, }, cssClass: 'modal modal-desktop', backdropDismiss: false @@ -986,27 +987,23 @@ export class AgendaPage implements OnInit { } async AproveEventEditEvent(data){ - console.log(data) this.postEvent =data; this.mobileComponent.transparentEventToApprove= true; this.mobileComponent.showAddNewEvent = true; } // open component - async openAttendeesComponent(data){ + async openAttendeesComponent(data) { if(Array.isArray(data)){ if(data.length >= 1){ - - console.log('save!!!',data.length); - console.log(data); + this.contacts = data ; } } this.cloneAllmobileComponent(); this.mobileComponent.showAttendees = true; - } async clearContact(){ @@ -1049,14 +1046,19 @@ export class AgendaPage implements OnInit { } - async setIntervenient(data){ + async setIntervenient(data) { this.taskParticipants = data; - this.postEvent } - async setIntervenientCC(data){ + async setIntervenientCC(data) { this.taskParticipantsCc = data; } + // Emitters + // adding + async setAdding(adding: "intervenient" | "CC" = "intervenient") { + this.adding = adding; + } + } \ No newline at end of file diff --git a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts index b8fa2eef2..0ed22b7f7 100644 --- a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts +++ b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.ts @@ -34,10 +34,9 @@ export class ApproveEventModalPage implements OnInit { private popoverController: PopoverController, private menu: MenuController, private alertService: AlertService, - ) - { + ) { this.serialNumber = this.navParams.get('serialNumber'); - } + } ngOnInit() { this.getTask(); @@ -72,7 +71,6 @@ export class ApproveEventModalPage implements OnInit { } approveTask(serialNumber:string){ let body = { "serialNumber": serialNumber, "action": "Aprovar" } - console.log(body); this.processes.PostTaskAction(body); this.alertService.presentAlert('Operação realizada com sucesso!'); this.router.navigate(['/home/gabinete-digital/event-list']); @@ -80,7 +78,6 @@ export class ApproveEventModalPage implements OnInit { } emendTask(serialNumber:string){ - /* console.log('Emendar'); */ this.menu.close(); this.openEmendMessageModal(serialNumber); this.modalController.dismiss(null); @@ -89,7 +86,6 @@ export class ApproveEventModalPage implements OnInit { rejectTask(serialNumber:string){ let body = { "serialNumber": serialNumber, "action": "Rejeitar" } - console.log(body); this.processes.PostTaskAction(body); this.alertService.presentAlert('Operação realizada com sucesso!'); this.router.navigate(['/home/gabinete-digital/event-list']); @@ -134,7 +130,6 @@ export class ApproveEventModalPage implements OnInit { "ReviewerComments": res.data, } } - console.log(body); this.processes.PostTaskAction(body); this.router.navigate(['/home/gabinete-digital/event-list']); this.alertService.presentAlert('Operação realizada com sucesso!'); diff --git a/src/app/pages/agenda/edit-event/edit-event.page.html b/src/app/pages/agenda/edit-event/edit-event.page.html index 14980462d..70cfc2bcd 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.html +++ b/src/app/pages/agenda/edit-event/edit-event.page.html @@ -61,7 +61,7 @@
Reunião @@ -144,7 +144,7 @@
- Adicionar intervenientes + Adicionar intervenientes {{participant.Name}} @@ -164,7 +164,7 @@
- Adicionar intervenientes + Adicionar intervenientes {{participant.Name}} @@ -203,7 +203,6 @@
- diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/pages/agenda/edit-event/edit-event.page.ts index 3342f8ea3..7a23ad41b 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/src/app/pages/agenda/edit-event/edit-event.page.ts @@ -37,9 +37,12 @@ export class EditEventPage implements OnInit { private eventsService: EventsService, private alertService: AlertService, public alertController: AlertController, - ) { + ) { this.isEventEdited = false; this.postEvent = this.navParams.get('event'); + if(this.postEvent){ + this.postEvent.Body.Text = this.postEvent.Body.Text.replace(/<[^>]+>/g, ''); + } this.taskParticipants = []; this.taskParticipantsCc = []; @@ -62,7 +65,7 @@ export class EditEventPage implements OnInit { } ngOnInit() { - + window.onresize = (event) => { // if not mobile remove all component if( window.innerWidth >= 800){ @@ -71,11 +74,12 @@ export class EditEventPage implements OnInit { }; } + close(){ this.modalController.dismiss(); } + save(){ - console.log(this.postEvent); this.eventsService.editEvent(this.postEvent, 2, 3).subscribe(async () => { const alert = await this.alertController.create({ @@ -89,13 +93,15 @@ export class EditEventPage implements OnInit { this.modalController.dismiss(this.isEventEdited); } - async openAttendees(){ + async openAttendees() { if(window.innerWidth <= 1024) { const modal = await this.modalController.create({ component: AttendeesPage, componentProps: { - eventAttendees: this.postEvent.Attendees + adding: this.adding, + taskParticipants: this.taskParticipants, + taskParticipantsCc: this.taskParticipantsCc }, cssClass: 'attendee', backdropDismiss: false @@ -104,40 +110,39 @@ export class EditEventPage implements OnInit { await modal.present(); modal.onDidDismiss().then((data) => { - if (data['data'] != null) - { - let newattendees: EventPerson[] = data['data']; - this.setIntervenient(newattendees); + + if(data){ + data = data['data']; + + const newAttendees: EventPerson[] = data['taskParticipants']; + const newAttendeesCC: EventPerson[] = data['taskParticipantsCc']; + + this.setIntervenient(newAttendees); + this.setIntervenientCC(newAttendeesCC); } }); } } - async dynamicSetIntervenient(data){ - this.taskParticipants = data['taskParticipants']; - this.taskParticipantsCc = data['taskParticipantsCc']; - } - - async setIntervenient(data){ + setIntervenient(data){ this.taskParticipants = data; - this.postEvent.Attendees = data; } - async setIntervenientCC(data){ + setIntervenientCC(data){ this.taskParticipantsCc = data; } - async addParticipants(){ - this.adding = 'intervenient'; + addParticipants(){ + this.adding = 'intervenient' + this.openAttendees(); } - async addParticipantsCC(){ - this.adding = 'CC'; + addParticipantsCC(){ + this.adding = 'CC' this.openAttendees(); } - async closeComponent(){} -} +} \ No newline at end of file diff --git a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html index cccbb6bd7..48207f9d6 100644 --- a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html +++ b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html @@ -15,12 +15,8 @@ - -
- - Cancelar - Gravar - +
+ +
- diff --git a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.scss b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.scss index 54851ac15..58229d622 100644 --- a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.scss +++ b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.scss @@ -1,5 +1,5 @@ .header-content{ - width: 360px; + //width: 360px; overflow: auto; margin: 25px auto; } @@ -38,4 +38,11 @@ border-radius: 22.5px; --background: #42b9fe; margin: 0 0px 0 12px; + } + .buttons{ + display: flex; + width: 100% !important; + justify-content: space-between; + padding: 15px; + overflow: auto; } \ No newline at end of file diff --git a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts index 937b1c0f2..241c43cb1 100644 --- a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts +++ b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts @@ -11,12 +11,14 @@ export class EmendMessageModalPage implements OnInit { constructor( private modalController: ModalController, - ) { } + ) { + this.emendMessage = ''; + } ngOnInit() { } close(){ - this.modalController.dismiss(this.emendMessage); + this.modalController.dismiss(''); } save(){ this.modalController.dismiss(this.emendMessage); diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html index 85fdc97a4..51efa7332 100644 --- a/src/app/pages/agenda/new-event/new-event.page.html +++ b/src/app/pages/agenda/new-event/new-event.page.html @@ -129,22 +129,30 @@
-
+
- Adicionar participantes - - + Adicionar interveniente +
+ + + {{participant.Name}} + + +
+
-
+
+ +