diff --git a/src/app/models/attachment.model.ts b/src/app/models/attachment.model.ts index 0ce74ed89..996164ee0 100644 --- a/src/app/models/attachment.model.ts +++ b/src/app/models/attachment.model.ts @@ -9,6 +9,7 @@ export class Attachment { CreateDate: string; Stakeholders: string; Link: string; + ApplicationId?: string; //Data: any; } diff --git a/src/app/models/event.model.ts b/src/app/models/event.model.ts index 46961931d..8f3e88770 100644 --- a/src/app/models/event.model.ts +++ b/src/app/models/event.model.ts @@ -3,6 +3,7 @@ import { EventPerson } from './eventperson.model'; import { SearchDocument } from './search-document'; export class Event{ + ParentId?: string; EventId: string; Subject: string; Body: EventBody; diff --git a/src/app/models/task.ts b/src/app/models/task.ts new file mode 100644 index 000000000..05169b5c3 --- /dev/null +++ b/src/app/models/task.ts @@ -0,0 +1,26 @@ +export class ProcessTask { + SerialNumber: string + actions: string; + formURL: string + originator: { + email: string, + manager: string, + displayName: "", + fqn: string, + username: string + } + serialNumber: string + taskStartDate: string + workflowDisplayName: string + workflowID: number + workflowInstanceDataFields: { + FsId: string, + MessageId: string, + UserId: string, + DocId: string, + ViewerRequest: string, + } + workflowInstanceFolio: string + workflowInstanceID: number + workflowName: string +} \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts index a778c11f2..60b25ebeb 100644 --- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.ts @@ -80,6 +80,7 @@ export class ExpedientTaskModalPage implements OnInit { DeadlineType: '', }; + this.postData.DispatchFolder = this.dispatchFolder; this.postData.UsersSelected = this.participants; /* By Default TypeDeadline should be 'Normal' */ @@ -96,10 +97,16 @@ export class ExpedientTaskModalPage implements OnInit { } ngOnInit() { + this.taskDate = new Date(this.task.taskStartDate); - this.getAttachments(); + if(!this.task.hasOwnProperty('isEvent')) { + // if not + this.getAttachments(); + } + this.getSubjectType(); + } close(){ @@ -107,13 +114,13 @@ export class ExpedientTaskModalPage implements OnInit { this.modalController.dismiss(null); } - getSubjectType(){ + getSubjectType() { this.processes.GetSubjectType().subscribe(res=>{ console.log(res); this.subjectTypes = res; }); } - cancelTask(){ + cancelTask() { this.modalController.dismiss(null); } @@ -140,8 +147,8 @@ export class ExpedientTaskModalPage implements OnInit { }; }) - if(this.taskParticipants.length > 0){ - switch (this.taskType){ + if(this.taskParticipants.length > 0) { + switch (this.taskType) { case '0': this.postData = { DistributionType: "Paralelo", @@ -152,7 +159,7 @@ export class ExpedientTaskModalPage implements OnInit { UsersSelected: attendees, DispatchFolder: this.dispatchFolder, } - console.log(this.postData); + console.log('this.postData', this.postData, this.taskType); this.processes.postDespatcho(this.postData); break; case '1': @@ -182,23 +189,26 @@ export class ExpedientTaskModalPage implements OnInit { this.processes.postDeferimento(this.postData); break; } + + this.modalController.dismiss('openDiscart'); /* this.distartExpedientModal(); this.close(); */ } - else{ + else { this.alertController.presentAlert("Lista de intervenientes vazia. Por favor, adicione 1 ou mais intervenientes."); } } - getAttachments(){ + + getAttachments() { this.attachmentsService.getAttachmentsBySerial(this.task.serialNumber).subscribe(res=>{ this.loadedAttachments = res; console.log(res); }); } - async addParticipants(){ + async addParticipants() { /* console.log('HERES'); */ @@ -241,7 +251,7 @@ export class ExpedientTaskModalPage implements OnInit { } } - async addParticipantsCc(){ + async addParticipantsCc() { this.adding = "CC"; this.contacts = this.taskParticipantsCc; @@ -282,7 +292,7 @@ export class ExpedientTaskModalPage implements OnInit { } - async distartExpedientModal(){ + async distartExpedientModal() { const modal = await this.modalController.create({ component: DiscartExpedientModalPage, componentProps: { @@ -304,7 +314,7 @@ export class ExpedientTaskModalPage implements OnInit { }); } - async setContact(data:EventPerson[]){ + async setContact(data:EventPerson[]) { if(this.adding == "intervenient"){ this.taskParticipants = data; @@ -315,15 +325,15 @@ export class ExpedientTaskModalPage implements OnInit { } - async setIntervenient(data){ + async setIntervenient(data) { this.taskParticipants = data; } - async setIntervenientCC(data){ + async setIntervenientCC(data) { this.taskParticipantsCc = data; } - async closeComponent(){ + async closeComponent() { this.showAttendees = false; } diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index 9f95377a7..8f4d5fb66 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts @@ -14,6 +14,7 @@ import { BookMeetingModalPage } from '../book-meeting-modal/book-meeting-modal.p import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page'; import { momentG } from 'src/plugin/momentG' import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page'; +import { ProcessTask } from 'src/app/models/task'; @Component({ selector: 'app-expediente-detail', @@ -91,6 +92,9 @@ export class ExpedienteDetailPage implements OnInit { "FsId": res.workflowInstanceDataFields.FsId, "DocId": res.workflowInstanceDataFields.DocId, } + + console.log('task', this.fulltask); + this.fulltask = res; console.log('GetTask', res); diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss index 47d34a555..fc5c8be7b 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss @@ -339,9 +339,42 @@ ion-content{ .active { + color: white !important; + fill: white !important; background: #42b9fe !important; box-sizing: border-box; .exp-card-title { - color: white !important; + color: rgb(255, 255, 255) !important; } -} \ No newline at end of file + + svg path::part(native) { + color: white !important; + fill: white !important; + } + + svg path::part(button):hover { + color: white !important; + fill: rgb(255, 255, 255) !important; + } + + svg{ + path{ + fill: rgb(255, 255, 255) !important + } + } +} + +.active ion-icon::part(button) { + color: white !important; + fill: rgb(255, 255, 255) !important; +} + +.active ion-icon::part(native) { + color: white !important; + fill: rgb(255, 255, 255) !important; +} + +.active ion-icon{ + color: white !important; + fill: red !important; +} 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 afecd9c80..17fc8286e 100644 --- a/src/app/shared/agenda/view-event/view-event.page.html +++ b/src/app/shared/agenda/view-event/view-event.page.html @@ -6,34 +6,26 @@ - + Efectuar Despacho - + Pedido de Parecer - + Pedido de Deferimento - + Marcar reunião - + @@ -54,7 +46,7 @@ {{loadedEvent.Subject}} -
+
@@ -64,10 +56,6 @@
- - - -
@@ -112,10 +100,21 @@
Documentos Anexados
- - -

{{attach.SourceName}}

-

{{attach.Stakeholders}}{{ attach.CreateDate | date: 'dd-MM-yy' }}

+ + +
+

{{attach.SourceName}}

+ {{attach.Stakeholders}} +
+ +
+ {{ attach.CreateDate | date: 'dd-MM-yy' }} +
+ + + + +
diff --git a/src/app/shared/agenda/view-event/view-event.page.ts b/src/app/shared/agenda/view-event/view-event.page.ts index 6c6dbee09..ebc6f05df 100644 --- a/src/app/shared/agenda/view-event/view-event.page.ts +++ b/src/app/shared/agenda/view-event/view-event.page.ts @@ -5,10 +5,11 @@ import { EventBody } from 'src/app/models/eventbody.model'; import { AttachmentsService } from 'src/app/services/attachments.service'; import { EventsService } from 'src/app/services/events.service'; import { Event } from 'src/app/models/event.model'; -import { EditEventPage } from 'src/app/pages/agenda/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 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page'; +import { momentG } from 'src/plugin/momentG'; +import { BookMeetingModalPage } from 'src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page'; @Component({ selector: 'app-view-event', @@ -34,13 +35,13 @@ export class ViewEventPage implements OnInit { days = ["Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"]; documents: Attachment[] = []; + dicIndex = 0; @Input() profile:string; @Input() eventId: string; @Output() viewEventDetailDismiss = new EventEmitter(); - constructor( private eventsService: EventsService, private attachmentsService: AttachmentsService, @@ -54,7 +55,6 @@ export class ViewEventPage implements OnInit { this.loadedEvent = new Event(); this.eventBody = { BodyType : "1", Text : ""}; this.loadedEvent.Body = this.eventBody; - } ngOnInit() { @@ -69,6 +69,10 @@ export class ViewEventPage implements OnInit { this.loadEvent(); } + docIndex(index: number) { + this.dicIndex = index; + } + close(){ console.log(this.isEventEdited); @@ -86,10 +90,8 @@ export class ViewEventPage implements OnInit { this.customDate = this.days[this.today.getDay()]+ ", " + this.today.getDate() +" de " + ( this.months[this.today.getMonth()]); this.getAttachments(this.loadedEvent.EventId); }); - - - } + deleteEvent(){ this.eventsService.deleteEvent(this.loadedEvent.EventId, 0).subscribe(async () => { @@ -131,7 +133,6 @@ export class ViewEventPage implements OnInit { }); } - async openExpedientActionsModal(taskAction: any, task: any) { //this.modalController.dismiss(); let classs; @@ -140,6 +141,21 @@ export class ViewEventPage implements OnInit { } else { classs = 'modal modal-desktop showAsideOptions' } + + const doc = this.loadedAttachments[ this.dicIndex]; + + 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: { @@ -162,4 +178,38 @@ export class ViewEventPage implements OnInit { }); } -} + async openBookMeetingModal(task: any) { + + const doc = this.loadedAttachments[ this.dicIndex]; + + 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(); + } + +} \ No newline at end of file