diff --git a/.gitignore b/.gitignore index 2db2d43da..52265823b 100644 --- a/.gitignore +++ b/.gitignore @@ -42,4 +42,8 @@ src/app/architect/ src/environments/environment.e2e.ts .env platforms_ -_platforms \ No newline at end of file +_platforms + + +src/app/store/notification.service.spec.ts +src/app/store/notification.service.ts \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 0356fc6d8..327dd8601 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21752,6 +21752,15 @@ "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz", "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=" }, + "ng2-pdf-viewer": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/ng2-pdf-viewer/-/ng2-pdf-viewer-7.0.1.tgz", + "integrity": "sha512-kjjsvHd5t1Ff7ydb3Far3d6cSyw/XJH5KXgcp/0bFzSFBAV2c5aOghxoY/yQVjgG+R6F16nVUh2UrZdngLXLSg==", + "requires": { + "pdfjs-dist": "~2.7.570", + "tslib": "^2.0.0" + } + }, "ngx-socket-io": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/ngx-socket-io/-/ngx-socket-io-3.2.0.tgz", @@ -22617,6 +22626,11 @@ "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==" }, + "pdfjs-dist": { + "version": "2.7.570", + "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-2.7.570.tgz", + "integrity": "sha512-/ZkA1FwkEOyDaq11JhMLazdwQAA0F9uwrP7h/1L9Akt9KWh1G5/tkzS+bPuUELq2s2GDFnaT+kooN/aSjT7DXQ==" + }, "pend": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", diff --git a/package.json b/package.json index 8e99fe4b8..d4d5367b1 100644 --- a/package.json +++ b/package.json @@ -93,6 +93,7 @@ "jetifier": "^1.6.6", "lite-server": "^2.6.1", "moment": "^2.29.1", + "ng2-pdf-viewer": "^7.0.1", "ngx-socket-io": "^3.2.0", "puppeteer": "^10.1.0", "rxjs": "~6.6.3", diff --git a/src/app/OtherService/document-counter.service.ts b/src/app/OtherService/document-counter.service.ts index a2b8c2059..6891c3cfa 100644 --- a/src/app/OtherService/document-counter.service.ts +++ b/src/app/OtherService/document-counter.service.ts @@ -4,7 +4,6 @@ import { EventoAprovacaoStore } from 'src/app/store/eventoaprovacao-store.servic import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service'; import { PendentesStore } from 'src/app/store/pendestes-store.service'; import { PedidosStore } from 'src/app/store/pedidos-store.service'; -import { ExpedienteprStore } from 'src/app/store/expedientepr-store.service'; import { DespachosprStore } from 'src/app/store/despachospr-store.service'; import { DeplomasStore } from '../store/deplomas.service'; @@ -18,22 +17,22 @@ export class DocumentCounterService { despachoStore = DespachoStore; eventoAprovacaoStore = EventoAprovacaoStore; pedidosStore = PedidosStore; - expedientePrStore = ExpedienteprStore; + // expedientePrStore = ExpedienteprStore; despachoPrStore = DespachosprStore; deplomasStore = DeplomasStore constructor() { } // falta a contagem dos deplomas - get mdTotalDocument() { - return this.despachoStore.count + this.expedienteGbStore.count + this.pedidosStore.countdeferimento - + this.pedidosStore.countparecer + this.expedientePrStore.count + this.despachoPrStore.count + this.pendentesStore.count - + this.eventoAprovacaoStore.count + this.deplomasStore.diplomasListCount + this.deplomasStore.countDiplomasListCount + get mdTotalDocument(): number { + return this.despachoStore.count + /** this.expedientePrStore.count + */ this.pedidosStore.countdeferimento + + this.pedidosStore.countparecer + this.expedienteGbStore.count + this.despachoPrStore.count + this.pendentesStore.count + + this.eventoAprovacaoStore.count + this.deplomasStore.diplomasListCount + this.deplomasStore.countDiplomasAssinadoListCount + this.deplomasStore.deplomasReviewCount } - get prTotalDocument() { - return this.despachoStore.count + this.expedienteGbStore.count + this.pedidosStore.countdeferimento - + this.pedidosStore.countparecer + this.expedientePrStore.count + this.despachoPrStore.count + this.pendentesStore.count - + this.eventoAprovacaoStore.count + this.deplomasStore.diplomasListCount + this.deplomasStore.countDiplomasListCount + get prTotalDocument(): number { + return this.despachoStore.count + /** this.expedientePrStore.count + */ this.pedidosStore.countdeferimento + + this.pedidosStore.countparecer + this.expedienteGbStore.count + this.despachoPrStore.count + this.pendentesStore.count + + this.eventoAprovacaoStore.count + this.deplomasStore.diplomasListCount + this.deplomasStore.countDiplomasAssinadoListCount + this.deplomasStore.deplomasReviewCount } } diff --git a/src/app/OtherService/permission.service.ts b/src/app/OtherService/permission.service.ts index 390fc0617..7323fc6d4 100644 --- a/src/app/OtherService/permission.service.ts +++ b/src/app/OtherService/permission.service.ts @@ -1,12 +1,12 @@ import { Injectable } from '@angular/core'; -import { UserStore } from 'src/app/store/user.service' +import { SessionStore } from '../store/session.service'; @Injectable({ providedIn: 'root' }) export class PermissionService { - userStore = UserStore + SessionStore = SessionStore constructor() { } @@ -16,7 +16,7 @@ export class PermissionService { args = [args] } - return args.includes(this.userStore.user.Profile) + return args.includes(this.SessionStore.user.Profile) } role(args: any) { diff --git a/src/app/Rules/deploma.service.ts b/src/app/Rules/deploma.service.ts index 26d9b0acd..a5f3ec12c 100644 --- a/src/app/Rules/deploma.service.ts +++ b/src/app/Rules/deploma.service.ts @@ -1,4 +1,5 @@ import { Injectable } from '@angular/core'; +import { CustomTaskPipe } from '../pipes/custom-task.pipe'; import { ProcessesService } from '../services/processes.service'; @Injectable({ @@ -20,6 +21,8 @@ export class DeplomaService { ] } + customTaskPipe = new CustomTaskPipe() + constructor( private processes: ProcessesService, ) { } @@ -83,4 +86,9 @@ export class DeplomaService { return this.processes.CompleteTask(body) } + + async getList() { + + } + } diff --git a/src/app/Rules/despacho.service.ts b/src/app/Rules/despacho.service.ts index 24a261d96..f1387ac95 100644 --- a/src/app/Rules/despacho.service.ts +++ b/src/app/Rules/despacho.service.ts @@ -1,8 +1,11 @@ import { Injectable } from '@angular/core'; +import { customTask, fullTask } from '../models/dailyworktask.model'; import { AttachmentList } from '../models/Excludetask'; import { PermissionService } from '../OtherService/permission.service'; +import { CustomTaskPipe } from '../pipes/custom-task.pipe'; import { ProcessesService } from '../services/processes.service'; - +import { DespachoStore } from '../store/despacho-store.service'; +import { LoaderService } from 'src/app/store/loader.service' @Injectable({ providedIn: 'root' }) @@ -20,10 +23,14 @@ export class DespachoService { 'Tarefa do Despacho': 'Tarefa de Despacho' | 'Concluir' | 'rexecucao' } - constructor( + customTaskPipe = new CustomTaskPipe() + despachoStore = DespachoStore; + + constructor( private processes: ProcessesService, - public p: PermissionService - ) { } + public p: PermissionService, + public LoaderService: LoaderService + ) { } arquivar(note:string, documents:AttachmentList, serialnumber) { @@ -181,4 +188,50 @@ export class DespachoService { return this.processes.CompleteTask(body) } + + async getList({updateStore = false}): Promise { + + if (this.LoaderService.loading) { + return this.despachoStore.list + } + + this.LoaderService.push({}) + + let result: fullTask[] = [] + + try { + result = await this.processes.GetTasksList("Despacho", false).toPromise(); + } catch (error) { + + } finally { + this.LoaderService.pop({}) + } + + + result = result.filter(data => data.workflowInstanceDataFields.Status == "Active") + + let despachoList: customTask[] = new Array(); + + result.forEach((element, index) => { + + let task: customTask = this.customTaskPipe.transform(element); + despachoList.push(task); + + }); + + despachoList = this.sortArrayISODate(despachoList).reverse(); + + if(updateStore) { + this.despachoStore.reset(despachoList); + } + + return despachoList + } + + sortArrayISODate(myArray: any) { + return myArray.sort(function(a, b) { + return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0); + }); + } + } diff --git a/src/app/Rules/expediente.service.ts b/src/app/Rules/expediente.service.ts index 931180c15..f88c14f86 100644 --- a/src/app/Rules/expediente.service.ts +++ b/src/app/Rules/expediente.service.ts @@ -1,9 +1,40 @@ import { Injectable } from '@angular/core'; - +import { ProcessesService } from '../services/processes.service'; +import { ProcessDocumentService } from './process-document.service'; @Injectable({ providedIn: 'root' }) export class ExpedienteService { - constructor() { } + constructor( + private processes: ProcessesService, + private processDocumentService: ProcessDocumentService, + ) { } + + + discard({SerialNumber, Note =''}) { + let otherbody = { + "serialNumber": SerialNumber, + "action": "Passivo", + "ActionTypeId": 99999877, + "dataFields": { + "Note": Note, + } + } + + return this.processes.CompleteTask(otherbody) + } + + viewDocument({DocId, ApplicationId}) { + this.processDocumentService.viewDocument({DocId, ApplicationId}) + } + + CompleteTask({body}) { + return this.processes.CompleteTask(body) + } + + + UpdateTaskStatus({FolderId}){ + return this.processes.UpdateTaskStatus(FolderId) + } } diff --git a/src/app/Rules/expedientes.service.ts b/src/app/Rules/expedientes.service.ts deleted file mode 100644 index 16af6d7e5..000000000 --- a/src/app/Rules/expedientes.service.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { Injectable } from '@angular/core'; -import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; -import { ProcessesService } from '../services/processes.service'; -import { ProcessDocumentService } from './process-document.service'; - -@Injectable({ - providedIn: 'root' -}) -export class ExpedientesService { - - constructor( - private iab: InAppBrowser, - private processDocumentService: ProcessDocumentService, - private processes: ProcessesService, - ) { } - - viewDocument({DocId, ApplicationId}) { - this.processDocumentService.viewDocument({DocId, ApplicationId}) - } - - CompleteTask({body}) { - return this.processes.CompleteTask(body) - } - - - UpdateTaskStatus({FolderId}){ - return this.processes.UpdateTaskStatus(FolderId) - } - -} diff --git a/src/app/store/user.service.spec.ts b/src/app/Rules/task.service.spec.ts similarity index 57% rename from src/app/store/user.service.spec.ts rename to src/app/Rules/task.service.spec.ts index 3f804c9fd..0bbd21466 100644 --- a/src/app/store/user.service.spec.ts +++ b/src/app/Rules/task.service.spec.ts @@ -1,13 +1,13 @@ import { TestBed } from '@angular/core/testing'; -import { UserService } from './user.service'; +import { TaskService } from './task.service'; -describe('UserService', () => { - let service: UserService; +describe('TaskService', () => { + let service: TaskService; beforeEach(() => { TestBed.configureTestingModule({}); - service = TestBed.inject(UserService); + service = TestBed.inject(TaskService); }); it('should be created', () => { diff --git a/src/app/Rules/task.service.ts b/src/app/Rules/task.service.ts new file mode 100644 index 000000000..37574780c --- /dev/null +++ b/src/app/Rules/task.service.ts @@ -0,0 +1,15 @@ +import { Injectable } from '@angular/core'; +import { ProcessesService } from '../services/processes.service'; + +@Injectable({ + providedIn: 'root' +}) +export class TaskService { + + constructor( + private processes: ProcessesService, + ) { } + + + +} diff --git a/src/app/app.module.ts b/src/app/app.module.ts index c8f7c50b9..ea7ce1aef 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -54,6 +54,9 @@ import { far } from '@fortawesome/free-regular-svg-icons' import { fab } from '@fortawesome/free-brands-svg-icons' import { ScreenOrientation } from '@ionic-native/screen-orientation/ngx'; +import { PdfViewerModule } from 'ng2-pdf-viewer'; + + @NgModule({ declarations: [AppComponent], entryComponents: [], @@ -84,6 +87,8 @@ import { ScreenOrientation } from '@ionic-native/screen-orientation/ngx'; MatSelectModule, MatDialogModule, + // + PdfViewerModule ], providers: [ { provide: MAT_DATE_LOCALE, useValue: 'pt' }, diff --git a/src/app/guards/auth.guard.ts b/src/app/guards/auth.guard.ts index d8b99e5bd..1a39ff1f9 100644 --- a/src/app/guards/auth.guard.ts +++ b/src/app/guards/auth.guard.ts @@ -2,6 +2,7 @@ import { Injectable } from '@angular/core'; import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot, UrlTree, Router } from '@angular/router'; import { Observable } from 'rxjs'; import { LocalstoreService } from '../store/localstore.service'; +import { SessionStore } from '../store/session.service'; @Injectable({ providedIn: 'root' @@ -16,7 +17,7 @@ export class AuthGuard implements CanActivate { route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable | Promise | boolean | UrlTree { - if(window.location.pathname != '' && !this.localstoreService.get('UserData', false)) { + if(window.location.pathname != '' && !SessionStore.exist) { this.router.navigate(['/']); return false } else { diff --git a/src/app/guards/inactivity.guard.spec.ts b/src/app/guards/inactivity.guard.spec.ts new file mode 100644 index 000000000..5c99bfeef --- /dev/null +++ b/src/app/guards/inactivity.guard.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { InactivityGuard } from './inactivity.guard'; + +describe('InactivityGuard', () => { + let guard: InactivityGuard; + + beforeEach(() => { + TestBed.configureTestingModule({}); + guard = TestBed.inject(InactivityGuard); + }); + + it('should be created', () => { + expect(guard).toBeTruthy(); + }); +}); diff --git a/src/app/guards/inactivity.guard.ts b/src/app/guards/inactivity.guard.ts new file mode 100644 index 000000000..8d7c71dae --- /dev/null +++ b/src/app/guards/inactivity.guard.ts @@ -0,0 +1,33 @@ +import { Injectable } from '@angular/core'; +import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot, UrlTree } from '@angular/router'; +import { Observable } from 'rxjs'; +import { SessionStore } from '../store/session.service'; + +@Injectable({ + providedIn: 'root' +}) +export class InactivityGuard implements CanActivate { + + constructor( + private router:Router + ){} + + canActivate( + route: ActivatedRouteSnapshot, + state: RouterStateSnapshot): Observable | Promise | boolean | UrlTree { + + if(SessionStore.exist && SessionStore.user.Inactivity && !SessionStore.hasPin) { + // alert('stay set pin') + return true + + } else if(SessionStore.exist && !SessionStore.user.Inactivity) { + // alert('stay conform') + return true + } else { + this.router.navigate(['/home/events']); + return false + } + + } + +} diff --git a/src/app/guards/login.guard.ts b/src/app/guards/login.guard.ts index 38a3d3a1c..848df6137 100644 --- a/src/app/guards/login.guard.ts +++ b/src/app/guards/login.guard.ts @@ -2,6 +2,7 @@ import { Injectable } from '@angular/core'; import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot, UrlTree, Router } from '@angular/router'; import { Observable } from 'rxjs'; import { LocalstoreService } from '../store/localstore.service'; +import { SessionStore } from '../store/session.service'; @Injectable({ providedIn: 'root' @@ -15,7 +16,7 @@ export class LoginGuard implements CanActivate { route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable | Promise | boolean | UrlTree { - if(window.location.pathname == '/' && this.localstoreService.get('UserData', null) != null ) { + if(window.location.pathname == '/' && SessionStore.exist ) { this.router.navigate(['/home/events']); return false } else { diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts index 913654e9f..014635651 100644 --- a/src/app/home/home-routing.module.ts +++ b/src/app/home/home-routing.module.ts @@ -1,6 +1,7 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; import { AuthGuard } from '../guards/auth.guard'; +import { InactivityGuard } from '../guards/inactivity.guard'; import { UserDataResolver } from '../resolvers/userData.resolver'; import { HomePage } from './home.page'; @@ -368,20 +369,30 @@ const routes: Routes = [ ], }, - { - path: 'inactivity', - children: [ - { - path:'', - loadChildren: ()=> import('../pages/inactivity/inactivity.module').then(m => m.InactivityPageModule) - }, - ], - - }, ], canActivate: [AuthGuard] + }, + { + path: 'inactivity', + children: [ + { + path:'', + loadChildren: ()=> import('../pages/inactivity/inactivity.module').then(m => m.InactivityPageModule) + }, + ], + canActivate: [InactivityGuard] + }, + { + path: 'pin', + children: [ + { + path:'', + loadChildren: ()=> import('../pages/inactivity/inactivity.module').then(m => m.InactivityPageModule) + }, + ], + canActivate: [InactivityGuard] - } + }, ]; @NgModule({ diff --git a/src/app/home/home.page.html b/src/app/home/home.page.html index 1eb5d189e..1cdc523ab 100644 --- a/src/app/home/home.page.html +++ b/src/app/home/home.page.html @@ -3,25 +3,25 @@ - {{toDayEventStorage.eventsList.length}} + {{toDayEventStorage.eventsList.length + expedienteGdStore.count}} Início - Agenda + Agenda - {{ totalDocumentStore.count }} - {{ totalDocumentStore.count }} + {{ documentCounterService.mdTotalDocument }} + {{ documentCounterService.prTotalDocument }} Gabinete - Ações + Ações diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index cef00976b..2d33cb4e3 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -2,18 +2,22 @@ /* tslint:disable */ /// /// -import { Component, OnInit, NgZone, Inject } from '@angular/core'; -import { EventsService } from '../services/events.service'; +import { Component, OnInit, NgZone } from '@angular/core'; import { Event } from '../models/event.model'; -import { ProcessesService } from '../services/processes.service'; import { NotificationsService } from '../services/notifications.service'; +import { WebNotificationsService } from '../services/webnotifications.service'; import { ModalController, AlertController, AnimationController, Platform } from '@ionic/angular'; import { Router, ActivatedRoute } from '@angular/router'; import { ToDayEventStorage } from '../store/to-day-event-storage.service'; import { DocumentCounterService } from 'src/app/OtherService/document-counter.service' import { PermissionService } from '../OtherService/permission.service'; -import { TotalDocumentService, TotalDocumentStore } from '../store/total-document.service'; -// import { NetworkService } from '../services/network.service'; +import { TotalDocumentStore } from '../store/total-document.service'; +import { connection } from '../services/socket/synchro.service'; +import { DespachoService } from '../Rules/despacho.service'; +import { ExpedienteGdStore } from '../store/expedientegd-store.service'; +import { InativityService } from '../services/inativity.service'; +import { SessionStore } from '../store/session.service'; + // import * as Sentry from "@sentry/browser"; @@ -45,6 +49,7 @@ export class HomePage implements OnInit { toDayEventStorage = ToDayEventStorage totalDocumentStore = TotalDocumentStore + expedienteGdStore = ExpedienteGdStore adding: "intervenient" | "CC" = "intervenient"; mobileComponent = { @@ -67,20 +72,37 @@ export class HomePage implements OnInit { postEvent: any; folderId: string; - constructor(private zone: NgZone, + connection = connection + + constructor( + private zone: NgZone, private router: Router, public modalCtrl: AlertController, - private notificatinsservice: NotificationsService, + private notificationsService: NotificationsService, private platform: Platform, private activeroute: ActivatedRoute, + private webnotification: WebNotificationsService, + public p: PermissionService, public documentCounterService: DocumentCounterService, - // private network: NetworkService, - public p: PermissionService) { + private despachoRule: DespachoService, + private inativityService: InativityService) { this.router.events.subscribe((val) => { document.querySelectorAll('ion-modal').forEach((e: any) => e.remove()) }); + this.updateList() + + + window['inactivity/function'] = () => { + if(window.location.pathname != '/inactivity') { + + const pathname = window.location.pathname + SessionStore.setUrlBeforeInactivity(pathname) + this.router.navigate(['/inactivity']); + } + } + // if (typeof Worker !== 'undefined') { // // Create a new @@ -94,10 +116,11 @@ export class HomePage implements OnInit { // // You should add a fallback so that your program still executes correctly. // } - { - //this.folderId = this.navParams.get('folderId'); - } + } + + refreshing() { + } ngOnInit() { @@ -105,11 +128,12 @@ export class HomePage implements OnInit { this.network.checkNetworkDisconnection; */ console.log('Active route ', this.router.url) if (this.platform.is('desktop') || this.platform.is('mobileweb')) { - console.log('Notifications not supported') + this.webnotification.webconnection(); + this.webnotification.onReceviNotificationWeb(); } else { this.mobilefirstConnect(); - this.notificatinsservice.getAndpostToken2(); - this.notificatinsservice.onReceviNotification(); + this.notificationsService.getAndpostToken2(); + this.notificationsService.onReceviNotification(); } } @@ -149,8 +173,16 @@ export class HomePage implements OnInit { }); } } + } + updateList() { + this.notificationsService.registerCallback( + 'despachos', + () => { + this.despachoRule.getList({updateStore: true}) + } + ) } diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index 68bdd26f1..e9e23a859 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -10,7 +10,7 @@ import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discar import { ExpedienteDetailPage } from 'src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page'; import { SearchList } from 'src/app/models/search-document'; import { SearchPage } from 'src/app/pages/search/search.page'; -import { User } from 'src/app/models/user.model'; +import { LoginUserRespose } from 'src/app/models/user.model'; import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page'; import { ToastService } from 'src/app/services/toast.service'; import { FormControl, FormGroup, Validators } from '@angular/forms'; @@ -80,7 +80,7 @@ export class CreateProcessPage implements OnInit { documents:SearchList[] = []; - loggeduser: User; + loggeduser: LoginUserRespose; toppings = new FormControl(); @@ -282,10 +282,13 @@ export class CreateProcessPage implements OnInit { try { await this.processes.postDespatcho(this.postData).toPromise(); - await this.FinalizarDespacho(loader, 'Despacho criado'); + await this.despachoService.EfectuarDespacho({serialnumber: this.task.serialNumber}).toPromise(); + this.modalController.dismiss(); } catch (error) { this.toastService.badRequest('Processo não efectuado'); + + } finally { loader.remove() } @@ -505,7 +508,7 @@ export class CreateProcessPage implements OnInit { taskParticipants: this.taskParticipants, taskParticipantsCc: this.taskParticipantsCc }, - cssClass: 'modal attendee', + cssClass: 'modal attendee modal-desktop', backdropDismiss: false }); diff --git a/src/app/modals/delegar/delegar.page.ts b/src/app/modals/delegar/delegar.page.ts index c9ce5ab44..1a1116285 100644 --- a/src/app/modals/delegar/delegar.page.ts +++ b/src/app/modals/delegar/delegar.page.ts @@ -129,7 +129,7 @@ export class DelegarPage implements OnInit { taskParticipants: this.taskParticipants, taskParticipantsCc: this.taskParticipantsCc }, - cssClass: 'modal attendee', + cssClass: 'modal attendee modal-desktop', backdropDismiss: false }); diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts index fbf944428..34972d358 100644 --- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts +++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts @@ -5,7 +5,7 @@ import { Event } from 'src/app/models/event.model' import { EventPerson } from 'src/app/models/eventperson.model'; import { SearchPage } from 'src/app/pages/search/search.page'; import { SearchDocumentDetails, SearchFolderDetails, SearchFolderDetailsDocuments, SearchList } from 'src/app/models/search-document'; -import { User } from 'src/app/models/user.model'; +import { LoginUserRespose } from 'src/app/models/user.model'; import { AuthService } from 'src/app/services/auth.service'; import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page'; import { ToastService } from 'src/app/services/toast.service'; @@ -82,7 +82,7 @@ export class DocumentSetUpMeetingPage implements OnInit { formLocationSatus: boolean = false; showAttendees= false; - loggeduser: User; + loggeduser: LoginUserRespose; emptyTextDescription = "Sem intervenientes selecionados"; document: SearchFolderDetails | SearchDocumentDetails | any; diff --git a/src/app/modals/forward/forward.page.ts b/src/app/modals/forward/forward.page.ts index 02c92198a..ede8b6f3b 100644 --- a/src/app/modals/forward/forward.page.ts +++ b/src/app/modals/forward/forward.page.ts @@ -167,7 +167,7 @@ export class ForwardPage implements OnInit { taskParticipants: this.taskParticipants, taskParticipantsCc: this.taskParticipantsCc }, - cssClass: 'modal attendee', + cssClass: 'modal attendee modal-desktop', backdropDismiss: false }); diff --git a/src/app/modals/profile/edit-profile/edit-profile.page.html b/src/app/modals/profile/edit-profile/edit-profile.page.html index 9f59f72d0..d1ed6cfd8 100644 --- a/src/app/modals/profile/edit-profile/edit-profile.page.html +++ b/src/app/modals/profile/edit-profile/edit-profile.page.html @@ -28,7 +28,7 @@
-
{{loggeduser.RoleDescription}}
+
{{SessionStore.user.RoleDescription}}
@@ -36,7 +36,7 @@
- +
@@ -47,19 +47,19 @@
- +
-