-
-
- {{loadedEvent.Location}} -
-
- {{loadedEvent.CalendarName}} -
+
+

{{loadedEvent.Location}}{{loadedEvent.CalendarName}}

@@ -38,18 +33,18 @@
+
Intervenientes
-

Intervenientes

{{attendee.Name}}

 +
Detalhes
-

Detalhes

-

{{loadedEvent.Body.Text}}

+

diff --git a/src/app/shared/agenda/view-event/view-event.page.scss b/src/app/shared/agenda/view-event/view-event.page.scss index 1f9e14231..fc6473ef4 100644 --- a/src/app/shared/agenda/view-event/view-event.page.scss +++ b/src/app/shared/agenda/view-event/view-event.page.scss @@ -87,6 +87,19 @@ ion-menu{ width: 100%; margin: 0 auto; padding: 0; + overflow: auto; + + .date{ + float: left; + } + + .label{ + border-radius: 20px; + background: #ffb703; + float: right !important; + padding: 5px 13.5px 5px 13.5px; + color: #fff; + } } .location-detail{ @@ -95,35 +108,7 @@ ion-menu{ float: left; margin: 5px 5px 5px 0px; } - .button-mdgpr-Oficial{ - --border-radius: 20px; - --background: #ffb703; - margin-left: 5px; - float: left; - } - .button-mdgpr-Pessoal{ - --border-radius: 20px; - --background: #f05d5e; - margin-left: 5px; - float: left; - } - - .button-pr-Oficial{ - width: 91px; - --border-radius: 20px; - --background: #cbeecb; - margin-left: 5px; - float: left; - } - .button-pr-Pessoal{ - width: 91px; - --border-radius: 20px; - --background: #cab0dc; - margin-left: 5px; - float: left; - } - - + .button-calendar-type ion-button{ height: 25px; } From 426b9c2ae9c2c85d3f7dbfea4d3a028ebd06a5ab Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Tue, 30 Mar 2021 16:32:10 +0100 Subject: [PATCH 2/4] save --- src/app/shared/gabinete-digital/expedients/expedients.page.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts index b6f9aaf98..b0e57a5ef 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts @@ -49,7 +49,8 @@ export class ExpedientsPage implements OnInit { { this.processes.GetTasksList("Expediente", false).subscribe(result => { this.taskslist = new Array(); - result.forEach(element => { + let res = result.reverse(); + res.forEach(element => { let task: DailyWorkTask = { "SerialNumber": element.serialNumber, "Folio": element.workflowInstanceFolio, From 52a7b53174f0f021933e3e1e164589f8d8a7ea64 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 31 Mar 2021 13:52:40 +0100 Subject: [PATCH 3/4] improvements --- src/app/home/home.page.html | 2 +- src/app/pages/events/events.page.html | 2 +- src/app/pages/events/events.page.ts | 28 ++++++++++++++++--- .../discart-expedient-modal.page.ts | 6 +++- .../expedient-task-modal.page.ts | 1 + .../expediente/expediente.page.ts | 3 +- .../gabinete-digital/gabinete-digital.page.ts | 1 - src/app/services/processes.service.ts | 14 ++++++++++ .../expedients/expedients.page.ts | 4 +-- 9 files changed, 48 insertions(+), 13 deletions(-) diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html index 2129a6732..20699f0b9 100644 --- a/src/app/home/home.page.html +++ b/src/app/home/home.page.html @@ -4,7 +4,7 @@ {{totalEvent}} - Iníci1o + Início diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index bcf14acdb..6d32c9f3c 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -94,7 +94,7 @@ class="icon-next" slot="end" src="assets/images/icons-arrow-circle-arrow-right.svg" - (click)="openExpedientList()" + (click)="viewExpedientListPage()" >
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index f4f69ea52..87e032c93 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -1,4 +1,4 @@ -import { Component, OnInit, LOCALE_ID } from '@angular/core'; +import { Component, OnInit, LOCALE_ID, EventEmitter, Output } from '@angular/core'; import { Event } from '../../models/event.model'; import { EventsService } from 'src/app/services/events.service'; @@ -15,6 +15,7 @@ import { DailyWorkTask } from '../../models/dailyworktask.model'; import { ViewEventPage } from '../agenda/view-event/view-event.page'; import { ExpedientePage } from '../gabinete-digital/expediente/expediente.page'; import { ExpedienteDetailPage } from '../gabinete-digital/expediente/expediente-detail/expediente-detail.page'; +import { GabineteDigitalPage } from '../gabinete-digital/gabinete-digital.page'; @Component({ selector: 'app-events', @@ -58,6 +59,8 @@ export class EventsPage implements OnInit { taskslist:DailyWorkTask[]; expedientList:any; + @Output() openExpedientListPage:EventEmitter = new EventEmitter(); + constructor(private eventService: EventsService, private router: Router, private storageService:StorageService, @@ -65,6 +68,7 @@ export class EventsPage implements OnInit { private alertController: AlertService, private authService: AuthService, private processes:ProcessesService, + private gabineteService: GabineteDigitalPage, private modalController:ModalController) { this.prEventList = null; @@ -239,8 +243,7 @@ export class EventsPage implements OnInit { return await modal.present(); } - LoadList() - { + LoadList(){ this.processes.GetTasksList("Expediente", false).subscribe(result => { this.expedientList = result.reverse(); console.log(this.expedientList); @@ -306,13 +309,30 @@ export class EventsPage implements OnInit { }); } + viewExpedientListPage(){ + if( window.innerWidth <= 1024){ + this.openExpedientList(); + } + else{ + console.log('ttt'); + this.router.navigate(['/home/gabinete-digital']); + this.gabineteService.openExpedientListPage(); + } + } + async openExpedientList(){ + let classs; + if( window.innerWidth <= 800){ + classs = 'modal' + } else { + classs = 'modal modal-desktop' + } const modal = await this.modalController.create({ component: ExpedientePage, componentProps:{ profile: this.profile, }, - cssClass: 'modal', + cssClass: classs, backdropDismiss: false }); await modal.present(); diff --git a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts index 089f8d110..6a0a44bb5 100644 --- a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts +++ b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts @@ -10,6 +10,7 @@ import { ProcessesService } from 'src/app/services/processes.service'; }) export class DiscartExpedientModalPage implements OnInit { serialNumber:string; + folderId:string; constructor( private modalController: ModalController, private processes:ProcessesService, @@ -17,6 +18,7 @@ export class DiscartExpedientModalPage implements OnInit { private navParams: NavParams, ) { this.serialNumber = this.navParams.get('serialNumber'); + this.folderId = this.navParams.get('folderId'); } ngOnInit() { @@ -24,13 +26,15 @@ export class DiscartExpedientModalPage implements OnInit { } close(){ + /* let body = { "serialNumber": this.serialNumber, "action": "Tratado" } */ + this.processes.UpdateTaskStatus(this.folderId); this.modalController.dismiss(); } /* notDelete(){ } */ save(){ - let body = { "serialNumber": this.serialNumber, "action": "Task Completed" } + let body = { "serialNumber": this.serialNumber, "action": "Tratado" } console.log(body); this.processes.PostTaskAction(body); this.router.navigate(['/home/gabinete-digital/expediente']); 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 40de6e9e5..d32b3607a 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 @@ -224,6 +224,7 @@ export class ExpedientTaskModalPage implements OnInit { component: DiscartExpedientModalPage, componentProps: { serialNumber: this.task.serialNumber, + folderId: this.task.workflowInstanceDataFields.FolderID, }, cssClass: 'discart-expedient-modal', backdropDismiss: false diff --git a/src/app/pages/gabinete-digital/expediente/expediente.page.ts b/src/app/pages/gabinete-digital/expediente/expediente.page.ts index 447317a76..a932f2776 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente.page.ts +++ b/src/app/pages/gabinete-digital/expediente/expediente.page.ts @@ -38,8 +38,7 @@ export class ExpedientePage implements OnInit { this.LoadList(); } - LoadList() - { + LoadList(){ this.processes.GetTasksList("Expediente", false).subscribe(result => { this.taskslist = new Array(); result.forEach(element => { diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index c3ee3e6d9..8aad715eb 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -200,7 +200,6 @@ this.processesbackend.GetActionsList().subscribe(res=>{ async openExpedientList(){ this.closeAllDesktopComponent(); - let classs; if( window.innerWidth <= 1024){ classs = 'modal' diff --git a/src/app/services/processes.service.ts b/src/app/services/processes.service.ts index 186a5801b..7b595a04c 100644 --- a/src/app/services/processes.service.ts +++ b/src/app/services/processes.service.ts @@ -120,6 +120,20 @@ export class ProcessesService { console.log(res); }); } + + UpdateTaskStatus(folderId: any){ + const geturl = environment.apiURL + 'Tasks/UpdateTaskStatus'; + let params = new HttpParams(); + params = params.set("FolderId", folderId); + let options = { + headers: this.headers, + params: params, + }; + return this.http.post(`${geturl}`, options).toPromise().then(res =>{ + console.log(res); + }); + + } postDespatcho(body:any){ const geturl = environment.apiURL + 'Processes/CreateDispatch'; diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts index b0e57a5ef..af076a0ba 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts @@ -41,12 +41,10 @@ export class ExpedientsPage implements OnInit { openExpedientDetailPage(data){ console.log(data); - this.openExpedientDetail.emit(data); } - LoadList() - { + LoadList(){ this.processes.GetTasksList("Expediente", false).subscribe(result => { this.taskslist = new Array(); let res = result.reverse(); From fde809aa2990890105d8156cf5dfecd9e43fcc13 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 31 Mar 2021 14:25:41 +0100 Subject: [PATCH 4/4] save --- .../discart-expedient-modal.page.ts | 7 ++++++- src/app/services/processes.service.ts | 13 ++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts index 6a0a44bb5..8751419a2 100644 --- a/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts +++ b/src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page.ts @@ -27,7 +27,12 @@ export class DiscartExpedientModalPage implements OnInit { } close(){ /* let body = { "serialNumber": this.serialNumber, "action": "Tratado" } */ - this.processes.UpdateTaskStatus(this.folderId); + console.log(this.folderId); + console.log('FOLDER'); + + this.processes.UpdateTaskStatus(this.folderId).subscribe(res=>{ + console.log(res); + }); this.modalController.dismiss(); } /* notDelete(){ diff --git a/src/app/services/processes.service.ts b/src/app/services/processes.service.ts index 7b595a04c..0c2938706 100644 --- a/src/app/services/processes.service.ts +++ b/src/app/services/processes.service.ts @@ -121,18 +121,17 @@ export class ProcessesService { }); } - UpdateTaskStatus(folderId: any){ + UpdateTaskStatus(FolderId:string): Observable{ const geturl = environment.apiURL + 'Tasks/UpdateTaskStatus'; let params = new HttpParams(); - params = params.set("FolderId", folderId); + + params = params.set("FolderId", FolderId); + let options = { headers: this.headers, - params: params, + params: params }; - return this.http.post(`${geturl}`, options).toPromise().then(res =>{ - console.log(res); - }); - + return this.http.post(`${geturl}`,'', options); } postDespatcho(body:any){