diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index e299d678e..9f3eb8c31 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -18,6 +18,7 @@ import { ExpedienteDetailPage } from '../gabinete-digital/expediente/expediente- import { EventEditPage } from './edit-event/edit-event.component'; import { GabineteDigitalPage } from '../gabinete-digital/gabinete-digital.page'; import { EditEventPage } from '../agenda/edit-event/edit-event.page'; +import { User } from 'src/app/models/user.model'; @Component({ selector: 'app-events', @@ -63,6 +64,8 @@ export class EventsPage implements OnInit { @Output() openExpedientListPage:EventEmitter = new EventEmitter(); + loggeduser: User; + constructor(private eventService: EventsService, private router: Router, private storageService:StorageService, @@ -72,6 +75,9 @@ export class EventsPage implements OnInit { private processes:ProcessesService, /* private gabineteService: GabineteDigitalPage, */ private modalController:ModalController) { + + this.loggeduser = authService.ValidatedUser; + this.prEventList = null; // list @@ -127,7 +133,7 @@ export class EventsPage implements OnInit { switch (this.segment) { case "Combinada": - if(this.profile == "mdgpr"){ + if(this.loggeduser.Profile == 'MDGPR'){ this.eventService.getAllMdEvents(start, end).subscribe(res => { this.eventsList = res; @@ -158,7 +164,7 @@ export class EventsPage implements OnInit { break; case "Pessoal": - if(this.profile == "mdgpr"){ + if(this.loggeduser.Profile == 'MDGPR'){ this.eventService.getAllMdEvents(start, end).subscribe(res => { this.personaleventsList = res.filter(data => data.CalendarName == "Pessoal"); this.showLoader = false; @@ -172,7 +178,7 @@ export class EventsPage implements OnInit { break; case "Oficial": - if(this.profile == "mdgpr"){ + if(this.loggeduser.Profile == 'MDGPR'){ this.eventService.getAllMdEvents(start, end).subscribe(res => { this.officialeventsList = res.filter(data => data.CalendarName == "Oficial");; this.showLoader = false; diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.html b/src/app/pages/gabinete-digital/despachos/despachos.page.html index 746df29cb..cc00ed241 100644 --- a/src/app/pages/gabinete-digital/despachos/despachos.page.html +++ b/src/app/pages/gabinete-digital/despachos/despachos.page.html @@ -1,5 +1,4 @@ - - +
Despachos
@@ -23,13 +22,13 @@
-
+
{{ task.CreateDate | date: 'dd-MM-yy' }}
@@ -37,7 +36,7 @@ {{task.Senders}}
- {{task.WorkflowName}} + {{task.activityInstanceName}}
@@ -57,7 +56,7 @@
-
+
diff --git a/src/app/pages/gabinete-digital/despachos/despachos.page.scss b/src/app/pages/gabinete-digital/despachos/despachos.page.scss index e624d0744..7e13b0056 100644 --- a/src/app/pages/gabinete-digital/despachos/despachos.page.scss +++ b/src/app/pages/gabinete-digital/despachos/despachos.page.scss @@ -10,11 +10,11 @@ color:#000; overflow: auto; - .thetitle{ + .thetitle { width: fit-content; float: left; } - .theicon{ + .theicon { width: fit-content; float: right; } @@ -167,11 +167,24 @@ ion-item{ margin: 2.5px 0 2.5px 71px; float: left; } -.div-logo img{ +.div-logo img { width: 100%; } .div-profile{ font-size: 45px; float: right; margin-right: 10px; +} +.exp-workflow{ + float: left; + margin-left: 15px; + + .label{ + border-radius: 20px; + background: #ffb703; + font-size: 12px; + float: right; + padding: 2.5px 13.5px 2.5px 13.5px; + color: #fff; +} } \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index b85a12242..78e894afe 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -46,7 +46,7 @@

{{count_total_pending}} Documentos

-
+
@@ -78,11 +78,12 @@

- Documentos

-
+
-

Despacho do Presidente da República

+

Despacho do Presidente da República

+

Despacho

{{ count_de_pr }} Documentos

@@ -98,7 +99,7 @@
-
+
diff --git a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts index d11430a55..c3af50160 100644 --- a/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts +++ b/src/app/shared/gabinete-digital/despachos-pr/despachos-pr.page.ts @@ -15,6 +15,7 @@ import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discar import { AuthService } from 'src/app/services/auth.service'; import { DespachoPage } from 'src/app/pages/gabinete-digital/despachos/despacho/despacho.page'; import { DespachoPrPage } from 'src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page'; +import { User } from 'src/app/models/user.model'; @Component({ selector: 'app-despachos-pr', @@ -45,13 +46,17 @@ loadedAttachments:any; dicIndex = 0; inicial = false +loggeduser: User; + constructor ( private processes:ProcessesService, private modalController: ModalController, private alertService: AlertService, private authService: AuthService, + ) { this.profile = 'mdgpr'; + this.loggeduser = authService.ValidatedUser; } ngOnInit() { @@ -82,8 +87,9 @@ segmentChanged(ev: any) { this.loading = true; let result = await this.processes.GetTasksList("Despacho do Presidente da República", false).toPromise(); + console.log('result', result) let despachosPr = result.reverse().filter(data => data.workflowInstanceDataFields.Status == "Active"); - console.log(despachosPr); + console.log('despachosPr', despachosPr); despachosPr.forEach( (element, index) => {