diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts index ce8e2d8fc..b58c36be9 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -10,6 +10,7 @@ import { EditEventPage } from '../edit-event/edit-event.page'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; import { ProcessesService } from 'src/app/services/processes.service'; import { ExpedientTaskModalPage } from '../../gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page'; +import { BookMeetingModalPage } from '../../gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page'; @Component({ selector: 'app-view-event', @@ -37,6 +38,8 @@ export class ViewEventPage implements OnInit { months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"]; days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"]; + dicIndex = 0; + constructor( private modalController: ModalController, private navParams: NavParams, @@ -53,6 +56,7 @@ export class ViewEventPage implements OnInit { this.eventBody = { BodyType : "1", Text : ""}; this.loadedEvent.Body = this.eventBody; this.eventId = this.navParams.get('eventId'); + } ngOnInit() { @@ -178,7 +182,43 @@ export class ViewEventPage implements OnInit { } - async openExpedientActionsModal(taskAction: any, task: any) { + + + async openBookMeetingModal() { + + const doc = this.loadedAttachments[ this.dicIndex]; + + let task = { + serialNumber: doc.SourceId, + taskStartDate: doc.CreateDate, + isEvent: true, + workflowInstanceDataFields: { + FsId: doc.ApplicationId, + FolderID: null, + DocId: doc.SourceId, + Subject: doc.SourceName + }, + } + + let classs; + if( window.innerWidth <= 800){ + classs = 'book-meeting-modal modal modal-desktop' + } else { + classs = 'modal modal-desktop showAsideOptions' + } + const modal = await this.modalController.create({ + component: BookMeetingModalPage, + componentProps: { + task: task, + }, + cssClass: classs, + backdropDismiss: false + }); + await modal.present(); + modal.onDidDismiss(); + } + + async openExpedientActionsModal(taskAction: any) { //this.modalController.dismiss(); let classs; if( window.innerWidth <= 800){ @@ -186,6 +226,21 @@ export class ViewEventPage implements OnInit { } else { classs = 'modal modal-desktop showAsideOptions' } + + const doc = this.loadedAttachments[ this.dicIndex]; + + let task = { + serialNumber: doc.SourceId, + taskStartDate: doc.CreateDate, + isEvent: true, + workflowInstanceDataFields: { + FsId: doc.ApplicationId, + FolderID: null, + DocId: doc.SourceId, + Subject: doc.SourceName + }, + } + const modal = await this.modalController.create({ component: ExpedientTaskModalPage, componentProps: { diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html index 15a9b2b87..e25581eb4 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html @@ -24,15 +24,15 @@ - + Efectuar Despacho - + Pedido de Parecer - + Pedido de Deferimento diff --git a/src/app/services/processes.service.ts b/src/app/services/processes.service.ts index 55c65f18c..bed160c6a 100644 --- a/src/app/services/processes.service.ts +++ b/src/app/services/processes.service.ts @@ -148,7 +148,7 @@ export class ProcessesService { return this.http.get(`${geturl}`, options); } - postDespatcho(body:any){ + postDespatcho(body:any) { const geturl = environment.apiURL + 'Processes/CreateDispatch'; let options = { headers: this.headers, @@ -210,9 +210,4 @@ export class ProcessesService { return this.http.get(`${geturl}`, options); } - - - - - } diff --git a/src/app/shared/agenda/view-event/options/options.component.html b/src/app/shared/agenda/view-event/options/options.component.html new file mode 100644 index 000000000..c3e4ba0b5 --- /dev/null +++ b/src/app/shared/agenda/view-event/options/options.component.html @@ -0,0 +1,14 @@ + +
+ +
+
+ + +
+ + +
+ diff --git a/src/app/shared/agenda/view-event/options/options.component.scss b/src/app/shared/agenda/view-event/options/options.component.scss new file mode 100644 index 000000000..308751df6 --- /dev/null +++ b/src/app/shared/agenda/view-event/options/options.component.scss @@ -0,0 +1,54 @@ +.container{ + --padding-top:20px !important; + --padding-bottom:20px !important; + --padding-start:20px !important; + --padding-end:20px !important; + } + .arrow-right{ + display: none; + margin-bottom: 20px; + .arrow-right-icon{ + width: 37px; + float: right; + font-size: 35px; + overflow: hidden; + } + } + .buttons{ + display: flex; + flex-wrap: wrap; + justify-content: space-around; + } + .solid { + display: none; + width: 90%; + border-top: 1px solid #bbb; + margin: 0 auto !important; + } + @media only screen and (min-width: 1024px) { + .arrow-right{ + display: flex; + justify-content: flex-end; + } + .btn-cancel{ + //display: none; + width: 100% !important; + margin-bottom: 10px !important; + } + .btn-ok{ + width: 100% !important; + margin-bottom: 10px !important; + } + .btn-delete{ + width: 100% !important; + margin-bottom: 10px !important; + margin-top: 10px !important; + } + .solid{ + display: block; + } + .mobile-only{ + display: none !important; + } + } + \ No newline at end of file diff --git a/src/app/shared/agenda/view-event/options/options.component.spec.ts b/src/app/shared/agenda/view-event/options/options.component.spec.ts new file mode 100644 index 000000000..370263b60 --- /dev/null +++ b/src/app/shared/agenda/view-event/options/options.component.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { OptionsComponent } from './options.component'; + +describe('OptionsComponent', () => { + let component: OptionsComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ OptionsComponent ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(OptionsComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/shared/agenda/view-event/options/options.component.ts b/src/app/shared/agenda/view-event/options/options.component.ts new file mode 100644 index 000000000..b4280a4ec --- /dev/null +++ b/src/app/shared/agenda/view-event/options/options.component.ts @@ -0,0 +1,14 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-options', + templateUrl: './options.component.html', + styleUrls: ['./options.component.scss'], +}) +export class OptionsComponent implements OnInit { + + constructor() { } + + ngOnInit() {} + +} diff --git a/src/app/shared/agenda/view-event/view-event.module.ts b/src/app/shared/agenda/view-event/view-event.module.ts index b2e97a22b..50a50e219 100644 --- a/src/app/shared/agenda/view-event/view-event.module.ts +++ b/src/app/shared/agenda/view-event/view-event.module.ts @@ -8,6 +8,7 @@ import { ViewEventPageRoutingModule } from './view-event-routing.module'; import { ViewEventPage } from './view-event.page'; import { SharedModule } from 'src/app/shared/shared.module'; +import { ChatPopoverPage } from '../../popover/chat-popover/chat-popover.page'; @NgModule({ imports: [ @@ -17,6 +18,9 @@ import { SharedModule } from 'src/app/shared/shared.module'; SharedModule, ViewEventPageRoutingModule ], - declarations: [ViewEventPage] + declarations: [ + ViewEventPage, + ChatPopoverPage + ] }) export class ViewEventPageModule {} diff --git a/src/app/shared/agenda/view-event/view-event.page.html b/src/app/shared/agenda/view-event/view-event.page.html index 17fc8286e..f06689ef9 100644 --- a/src/app/shared/agenda/view-event/view-event.page.html +++ b/src/app/shared/agenda/view-event/view-event.page.html @@ -42,7 +42,7 @@