From 65dae85c640414ad591b7f6aad60a2f3b0b8ff62 Mon Sep 17 00:00:00 2001 From: Tiago Kayaya Date: Thu, 26 Nov 2020 05:41:54 +0100 Subject: [PATCH] save --- src/app/home/home.page.ts | 2 +- src/app/models/dailyworktask.model.ts | 1 + src/app/pages/agenda/agenda.page.html | 4 +- src/app/pages/agenda/agenda.page.ts | 4 +- .../approve-event-modal.page.html | 7 +- .../approve-event-modal.page.ts | 14 +++- src/app/pages/events/events.page.html | 74 ++++++++++++++-- src/app/pages/events/events.page.ts | 2 +- .../event-list/event-list.page.html | 6 +- .../book-meeting-modal.page.html | 8 +- .../book-meeting-modal.page.ts | 13 ++- .../expedient-task-modal.page.html | 8 +- .../expedient-task-modal.page.ts | 15 +++- .../expediente-detail.page.html | 2 +- .../expediente-detail.page.ts | 19 +++-- .../expediente/expediente.page.html | 2 +- .../expediente/expediente.page.ts | 3 +- .../gabinete-digital.page.html | 10 +-- .../gabinete-digital/gabinete-digital.page.ts | 4 +- src/assets/images/icons-agenda.svg | 32 +++++++ src/environments/environment.ts | 2 +- src/theme/variables.scss | 84 ++++++++++++++++++- 22 files changed, 266 insertions(+), 50 deletions(-) create mode 100644 src/assets/images/icons-agenda.svg diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index 5299c00df..33891d7b3 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -22,7 +22,7 @@ export class HomePage implements OnInit { ngOnInit() { //Initialize profile as mdgpr - this.profile = "mdgpr"; + this.profile = "pr"; if(this.profile == "mdgpr"){ this.eventService.getAllMdEvents(formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 00:00:00', formatDate(new Date(), 'yyyy-MM-dd', 'pt') + ' 23:59:59').subscribe(res => { this.eventsList = res; diff --git a/src/app/models/dailyworktask.model.ts b/src/app/models/dailyworktask.model.ts index ab417f7a7..3f3aea829 100644 --- a/src/app/models/dailyworktask.model.ts +++ b/src/app/models/dailyworktask.model.ts @@ -4,4 +4,5 @@ export class DailyWorkTask{ Senders: string; CreateDate: string; DocumentURL: string; + Remetente:string; } \ No newline at end of file diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index ae6289220..0e327f643 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -3,13 +3,13 @@ -
+ Agenda diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index b335c523f..8eafe4040 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -61,7 +61,7 @@ export class AgendaPage implements OnInit { ) {} ngOnInit() { - this.profile = "mdgpr"; + this.profile = "pr"; //Inicializar segment /* localStorage.setItem('test', this.eventSelectedDate.toString()); */ @@ -153,7 +153,7 @@ export class AgendaPage implements OnInit { case "Combinada": //Inicializa o array eventSource this.eventSource=[]; - if(this.profile == "mdgpr"){ + if(this.profile == "pr"){ this.eventService.getAllMdEvents(formatDate(startTime, 'yyyy-MM-dd HH:mm:ss', 'pt'), formatDate(endTime, 'yyyy-MM-dd HH:mm:ss', 'pt')).subscribe( response => { this.eventsList = response; diff --git a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html index d9568d424..3dd5efff9 100644 --- a/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html +++ b/src/app/pages/agenda/approve-event-modal/approve-event-modal.page.html @@ -49,7 +49,8 @@

{{customDate}}

das {{loadedEvent.workflowInstanceDataFields.StartDate | date: 'hh:mm'}} às {{loadedEvent.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}

-

(Não se repete)

+

(Não se repete)

+

Repete
@@ -68,13 +69,13 @@ -
+

Documentos Anexados

Receita por Natureza

-

OAPR - GTI13/04/2020

+

{{loadedAttachments.Remetente}}{{loadedAttachments.CreateDate}}

 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 3c6ccffc9..c283ea7d6 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 @@ -3,6 +3,7 @@ import { Router } from '@angular/router'; import { MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular'; import { Event } from 'src/app/models/event.model'; import { AlertService } from 'src/app/services/alert.service'; +import { AttachmentsService } from 'src/app/services/attachments.service'; import { ProcessesService } from 'src/app/services/processes.service'; import { EmendMessageModalPage } from '../emend-message-modal/emend-message-modal.page'; import { EventActionsPopoverPage } from '../event-actions-popover/event-actions-popover.page'; @@ -15,6 +16,7 @@ import { EventActionsPopoverPage } from '../event-actions-popover/event-actions- export class ApproveEventModalPage implements OnInit { event: Event; loadedEvent:any; + loadedAttachments:any; serialNumber:string; customDate:any; today:any; @@ -28,6 +30,7 @@ export class ApproveEventModalPage implements OnInit { private modalController: ModalController, private navParams: NavParams, private processes:ProcessesService, + private attachmentsService: AttachmentsService, private popoverController: PopoverController, private menu: MenuController, private alertService: AlertService, @@ -37,7 +40,8 @@ export class ApproveEventModalPage implements OnInit { } ngOnInit() { - this.getTask(); + this.getTask(); + this.getAttachments(); } notImplemented(){ @@ -69,7 +73,7 @@ export class ApproveEventModalPage implements OnInit { } emendTask(serialNumber:string){ - console.log('Emendar'); + /* console.log('Emendar'); */ this.menu.close(); this.openEmendMessageModal(serialNumber); this.modalController.dismiss(null); @@ -84,6 +88,12 @@ export class ApproveEventModalPage implements OnInit { this.router.navigate(['/home/gabinete-digital/event-list']); this.modalController.dismiss(null); } + getAttachments(){ + this.attachmentsService.getAttachmentsBySerial(this.serialNumber).subscribe(res=>{ + this.loadedAttachments = res; + console.log(res); + }); + } async openOptions(ev:any) { const popover = await this.popoverController.create({ diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index 48553187f..3591fab33 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -10,13 +10,13 @@ -
+ @@ -54,6 +54,10 @@

{{customDate}}

+
@@ -61,7 +65,7 @@ - + + +
+ + +
+
+

{{event.StartDate | date: 'hh:mm'}}

+

{{event.EndDate | date: 'hh:mm'}}

+
+
+

{{event.Location}}

+

{{event.Subject}}

+
+
+ + +
- + + +
+ + +
+
+

{{event.StartDate | date: 'hh:mm'}}

+

{{event.EndDate | date: 'hh:mm'}}

+
+
+

{{event.Location}}

+

{{event.Subject}}

+
+
+ + +
- + + +
+ + +
+
+

{{event.StartDate | date: 'hh:mm'}}

+

{{event.EndDate | date: 'hh:mm'}}

+
+
+

{{event.Location}}

+

{{event.Subject}}

+
+
+ + +
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 70921673c..41e3280cd 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -63,7 +63,7 @@ export class EventsPage implements OnInit { //Inicializar segment this.segment = "Combinada"; //Initialize profile as mdgpr - this.profile = "mdgpr"; + this.profile = "pr"; console.log(this.profile); diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.html b/src/app/pages/gabinete-digital/event-list/event-list.page.html index b8eb30bcc..1e0d67cd3 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.html +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.html @@ -46,7 +46,8 @@

{{event.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}

-

{{event.workflowInstanceDataFields.Location}}

+

{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/mm/yy'}} | {{event.workflowInstanceDataFields.Location}}

+

{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}

{{event.workflowInstanceDataFields.Subject}}

@@ -66,7 +67,8 @@

{{event.workflowInstanceDataFields.EndDate | date: 'hh:mm'}}

-

{{event.workflowInstanceDataFields.Location}}

+

{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} - {{ event.workflowInstanceDataFields.EndDate | date: 'dd/mm/yy'}} | {{event.workflowInstanceDataFields.Location}}

+

{{event.workflowInstanceDataFields.StartDate | date: 'd/M/yy' }} | {{event.workflowInstanceDataFields.Location}}

{{event.workflowInstanceDataFields.Subject}}

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 ecb887568..cca3a3782 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 @@ -164,15 +164,15 @@ -
+
Documentos Anexados - + -

{{task.Folio}}

-

OAPR - GTI{{ task.CreateDate| date: 'dd/MM/yyyy' }}

+

{{attachment.Description}}

+

{{attachment.Stakeholders}} {{ attachment.CreateDate | date: 'dd/MM/yyyy' }}

 diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts index 089c779be..7bdaa05a7 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts @@ -9,6 +9,7 @@ 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 { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page'; +import { AttachmentsService } from 'src/app/services/attachments.service'; @Component({ selector: 'app-book-meeting-modal', @@ -20,6 +21,7 @@ export class BookMeetingModalPage implements OnInit { taskParticipants: any; taskParticipantsCc: any; taskDocId:string; + loadedAttachments:any; postData: Event; eventBody: EventBody; @@ -32,6 +34,7 @@ export class BookMeetingModalPage implements OnInit { private router:Router, private navParams: NavParams, private processes:ProcessesService, + private attachmentsService: AttachmentsService, private calendarService: EventsService, ) { this.task = this.navParams.get('task'); @@ -52,6 +55,14 @@ export class BookMeetingModalPage implements OnInit { ngOnInit() { console.log(this.task) console.log(this.task.SerialNumber); + this.getAttachments(); + } + + getAttachments(){ + this.attachmentsService.getAttachmentsBySerial(this.task.SerialNumber).subscribe(res=>{ + this.loadedAttachments = res; + console.log(res); + }); } close(){ @@ -89,7 +100,7 @@ export class BookMeetingModalPage implements OnInit { this.processes.FindTaskDocId(this.task.SerialNumber).subscribe(res =>{ if(res){ - this.calendarService.postExpedientEvent(res, this.postData, "md",this.task.SerialNumber); + this.calendarService.postExpedientEvent(res, this.postData, "pr",this.task.SerialNumber); } }); this.distartExpedientModal(); 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 e246cb8af..859a0bbb5 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 @@ -86,15 +86,15 @@
-
+
Documentos Anexados - + -

{{task.workflowInstanceFolio}}

-

OAPR - GTI {{ taskDate | date: 'dd/MM/yyyy' }}

+

{{attachment.Description}}

+

{{attachment.Stakeholders}} {{ attachment.CreateDate | date: 'dd/MM/yyyy' }}

 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 add8cbbe0..57cac3fbe 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 @@ -12,6 +12,7 @@ import { AddParticipantsCcModalPage } from '../add-participants-cc-modal/add-par import { AddParticipantsModalPage } from '../add-participants-modal/add-participants-modal.page'; import { environment } from 'src/environments/environment'; import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page'; +import { AttachmentsService } from 'src/app/services/attachments.service'; @Component({ selector: 'app-expedient-task-modal', @@ -32,6 +33,7 @@ export class ExpedientTaskModalPage implements OnInit { taskDate: Date; taskDescription: string; user: string; + loadedAttachments:any; postData: Despacho; dispatchFolder: Folder; @@ -41,6 +43,7 @@ export class ExpedientTaskModalPage implements OnInit { private modalController: ModalController, private router:Router, private processes:ProcessesService, + private attachmentsService: AttachmentsService, private navParams: NavParams, private authService: AuthService, ) { @@ -53,9 +56,9 @@ export class ExpedientTaskModalPage implements OnInit { Nad: 30, Subject: '', Message: '', - SourceSecFsId: '8', + SourceSecFsId: this.task.workflowInstanceDataFields.FsId, SouceType: 'DOC', - SourceId: '', + SourceId: this.task.workflowInstanceDataFields.DocId, }; this.postData.DispatchFolder = this.dispatchFolder; @@ -73,7 +76,9 @@ export class ExpedientTaskModalPage implements OnInit { }); console.log(this.user); */ console.log(this.task) + console.log(this.task.serialNumber); + this.getAttachments(); } @@ -128,6 +133,12 @@ export class ExpedientTaskModalPage implements OnInit { this.distartExpedientModal(); this.close(); } + getAttachments(){ + this.attachmentsService.getAttachmentsBySerial(this.task.serialNumber).subscribe(res=>{ + this.loadedAttachments = res; + console.log(res); + }); + } async addParticipants(){ const modal = await this.modalController.create({ 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 9f78c4ff5..826405a58 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 @@ -61,7 +61,7 @@ Remetentes - OAPR - GTI + {{task.Remetente}} Data 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 99de79eb7..9e18bdb38 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 @@ -29,7 +29,7 @@ export class ExpedienteDetailPage implements OnInit { private modalController: ModalController, private alertService: AlertService) { } - task: DailyWorkTask; + task: any; fulltask:any; eventsList: Event[]; serialnumber:string; @@ -48,16 +48,17 @@ export class ExpedienteDetailPage implements OnInit { async LoadTaskDetail(serial:string) { - this.processes.GetTask(serial).subscribe(result => { + this.processes.GetTask(serial).subscribe(res => { this.task = { - "SerialNumber": result.serialNumber, - "Folio": result.workflowInstanceFolio, - "Senders": result.originator.email, - "CreateDate": formatDate(new Date(result.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'), - "DocumentURL": result.formURL + "SerialNumber": res.serialNumber, + "Folio": res.workflowInstanceFolio, + "Senders": res.originator.email, + "CreateDate": formatDate(new Date(res.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'), + "DocumentURL": res.formURL, + "Remetente": res.workflowInstanceDataFields.Remetente } - this.fulltask = result; - /* console.log(result); */ + this.fulltask = res; + console.log(res); }); } diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.html b/src/app/pages/gabinete-digital/expediente/expediente.page.html index 5f1bec52d..fa03dfd6a 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.html +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.html @@ -37,7 +37,7 @@

{{ task.Folio }}

 -

OAPR - GTI{{ task.CreateDate | date: 'dd-MM-yy' }}

+

{{task.Remetente}}{{ task.CreateDate | date: 'dd-MM-yy' }}

diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts index e56518733..46afcf33a 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts @@ -41,7 +41,8 @@ export class ExpedientePage implements OnInit { "Folio": element.workflowInstanceFolio, "Senders": element.originator.email, "CreateDate": formatDate(new Date(element.taskStartDate), 'yyyy-MM-dd HH:mm', 'pt'), - "DocumentURL": element.formURL + "DocumentURL": element.formURL, + "Remetente": element.workflowInstanceDataFields.Remetente } this.taskslist.push(task); }); diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 45c5a4610..d83420bbf 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -10,7 +10,7 @@ - + + Agenda do Presidente {{count_ev_pr}} - + --> Expediente @@ -44,7 +44,7 @@ - + diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 941ebfc0c..add7c8f61 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -42,9 +42,9 @@ export class GabineteDigitalPage implements OnInit { LoadCounts() { this.showLoader = true; - this.processesbackend.GetTasksList("Expediente", true).subscribe(result =>{ + this.processesbackend.GetTasksList("Expediente", true).subscribe(res =>{ this.showLoader = false; - this.count_exp_dailywork = result; + this.count_exp_dailywork = res; }); this.processesbackend.GetToApprovedEvents('PR','true').subscribe(res=>{ this.count_ev_pr = res; diff --git a/src/assets/images/icons-agenda.svg b/src/assets/images/icons-agenda.svg new file mode 100644 index 000000000..479d512d4 --- /dev/null +++ b/src/assets/images/icons-agenda.svg @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 4b92544cb..b533fc683 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -7,7 +7,7 @@ export const environment = { apiURL: 'http://gpr-dev-01.gabinetedigital.local/GabineteDigital.Services/V3/api/', apiChatUrl: 'http://192.168.100.111:3000/api/v1/', domain: 'gabinetedigital.local', - defaultuser: 'paulo.pinto', + defaultuser: 'tiago.kayaya', defaultuserpwd: 'tabteste@006' }; diff --git a/src/theme/variables.scss b/src/theme/variables.scss index 524a906b7..3ae3030b4 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -266,4 +266,86 @@ text-transform: capitalize; } /* .event-actions-popover ion-list{ -} */ \ No newline at end of file +} */ +.Rectangle { + width: 360px; + border-radius: 15px; + box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07); + border: solid 1px #e9e9e9; + background-color: var(--white); + margin: 0 auto; + padding: 10px; + margin-bottom: 10px; + overflow: auto; +} +.content-mdgpr-Oficial{ + width: 340px; + border-radius: 5px; + border-right: 5px solid #99e47b; + overflow: auto; +} +.content-mdgpr-Pessoal{ + width: 340px; + border-radius: 5px; + border-right: 5px solid #958bfc; + overflow: auto; +} +.content-pr-Oficial{ + width: 340px; + border-radius: 5px; + border-right: 5px solid #ffb703; + overflow: auto; +} +.content-pr-Pessoal{ + width: 340px; + border-radius: 5px; + border-right: 5px solid #f05d5e; + overflow: auto; +} + +.approve-event-time{ + float: left; +} +.approve-event-time p{ + width: 33px; + font-family: Roboto; + font-size: 13px; + font-weight: normal; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + color: var(--Antartic-grey); + margin: 0; + padding: 0; +} +.approve-event-detail{ + float: left; + margin-left: 10px; +} +.approve-event-detail p{ + width: 250px; + font-family: Roboto; + font-size: 13px; + font-weight: normal; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + color: var(--black); + margin: 0; + padding: 0; +} +.approve-event-detail h3{ + width: 250px; + font-family: Roboto; + font-size: 15px; + font-weight: bold; + font-stretch: normal; + font-style: normal; + line-height: normal; + letter-spacing: normal; + color: #0d89d1; + margin: 0; + padding: 0; +}