diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html index ece2b0057..b697d4df2 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.html +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.html @@ -27,15 +27,15 @@ refreshingText="A actualizar..."> - +
-
@@ -61,7 +61,7 @@ {{task.activityInstanceName}}
- + {{ task.CreateDate }} {{ task.CreateDate | date: 'dd-MM-yy' }} @@ -75,7 +75,7 @@
@@ -109,18 +109,18 @@
-
-
+
Lista vazia
-
-
+
Lista vazia @@ -128,7 +128,7 @@
- + diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts index 798f86192..43a1c0c34 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts @@ -111,7 +111,7 @@ export class PedidosPage implements OnInit { let task = { "SerialNumber": element.serialNumber, "Folio": element.workflowInstanceDataFields.Subject, - "Senders": element.originator.email, + "Senders": element.workflowInstanceDataFields.Sender, "CreateDate": taskDate, "DocumentURL": element.workflowInstanceDataFields.ViewerRequest, "Remetente": element.workflowInstanceDataFields.Remetente, From 9138f9903cf3ed7a809ba07c495778da7b0a943c Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 29 Jul 2021 17:02:16 +0100 Subject: [PATCH 06/11] improve --- .../OtherService/permission.service.spec.ts | 16 ++++++ src/app/OtherService/permission.service.ts | 42 ++++++++++++++ .../gabinete-digital/gabinete-digital.page.ts | 7 ++- src/app/services/auth.service.ts | 7 ++- src/app/store/user.service.spec.ts | 16 ++++++ src/app/store/user.service.ts | 56 +++++++++++++++++++ 6 files changed, 141 insertions(+), 3 deletions(-) create mode 100644 src/app/OtherService/permission.service.spec.ts create mode 100644 src/app/OtherService/permission.service.ts create mode 100644 src/app/store/user.service.spec.ts create mode 100644 src/app/store/user.service.ts diff --git a/src/app/OtherService/permission.service.spec.ts b/src/app/OtherService/permission.service.spec.ts new file mode 100644 index 000000000..1a77304d8 --- /dev/null +++ b/src/app/OtherService/permission.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { PermissionService } from './permission.service'; + +describe('PermissionService', () => { + let service: PermissionService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(PermissionService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/OtherService/permission.service.ts b/src/app/OtherService/permission.service.ts new file mode 100644 index 000000000..0b983736a --- /dev/null +++ b/src/app/OtherService/permission.service.ts @@ -0,0 +1,42 @@ +import { Injectable } from '@angular/core'; +import { UserStore } from 'src/app/store/user.service' + +@Injectable({ + providedIn: 'root' +}) +export class PermissionService { + + userStore = UserStore + + constructor() { } + + userRole(args) { + let data: string[] = [] + + if(!Array.isArray(args) && typeof(args) == 'string') { + data = [args] + } + + return data.includes(this.userStore.user.Profile) + } + + role(args: any) { + + let UserRoleIsValid = this.userRole(args) + + return { + permissionAnyOf(role) { + if(!Array.isArray(role) && typeof(role) == 'string') { + role = [role] + } + + if(!UserRoleIsValid) {return false } + + return true + + } + } + + } + +} \ No newline at end of file diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 6a1becab5..325e05906 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -20,6 +20,7 @@ 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 { PermissionService } from 'src/app/OtherService/permission.service'; @Component({ selector: 'app-gabinete-digital', templateUrl: './gabinete-digital.page.html', @@ -99,9 +100,10 @@ export class GabineteDigitalPage implements OnInit { private alertService: AlertService, private activatedRoute: ActivatedRoute, private router: Router, - authService: AuthService + authService: AuthService, + public p: PermissionService ) { - + this.loggeduser = authService.ValidatedUser; window.onresize = (event) => { @@ -123,6 +125,7 @@ export class GabineteDigitalPage implements OnInit { ngOnInit() { + const pathname = window.location.pathname this.LoadCounts(); diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts index af5b6a178..e5b42f8a1 100644 --- a/src/app/services/auth.service.ts +++ b/src/app/services/auth.service.ts @@ -10,6 +10,7 @@ import { AuthConnstants } from '../config/auth-constants'; import { AlertController } from '@ionic/angular'; import { LocalstoreService } from '../store/localstore.service'; import { ToastService } from './toast.service'; +import { UserStore } from 'src/app/store/user.service' @Injectable({ providedIn: 'root' @@ -18,9 +19,10 @@ export class AuthService { userData$ = new BehaviorSubject(''); userId$ = new BehaviorSubject(''); headers: HttpHeaders; - public ValidatedUser:User; + public ValidatedUser: User; public ValidatedUserChat:any; opts:any; + userStore = UserStore constructor( private http: HttpClient, @@ -74,7 +76,10 @@ export class AuthService { response.BasicAuthKey = user.BasicAuthKey this.ValidatedUser = response; + console.log('response', response) + this.localstoreService.set('user', response) + this.userStore.reset(response) this.storageService.store(AuthConnstants.USER, response); diff --git a/src/app/store/user.service.spec.ts b/src/app/store/user.service.spec.ts new file mode 100644 index 000000000..3f804c9fd --- /dev/null +++ b/src/app/store/user.service.spec.ts @@ -0,0 +1,16 @@ +import { TestBed } from '@angular/core/testing'; + +import { UserService } from './user.service'; + +describe('UserService', () => { + let service: UserService; + + beforeEach(() => { + TestBed.configureTestingModule({}); + service = TestBed.inject(UserService); + }); + + it('should be created', () => { + expect(service).toBeTruthy(); + }); +}); diff --git a/src/app/store/user.service.ts b/src/app/store/user.service.ts new file mode 100644 index 000000000..d81b56231 --- /dev/null +++ b/src/app/store/user.service.ts @@ -0,0 +1,56 @@ +import { Injectable } from '@angular/core'; +import { localstoreService } from './localstore.service' +import { SHA1 } from 'crypto-js' +import { User } from '../models/user.model'; + +@Injectable({ + providedIn: 'root' +}) +export class UserService { + + // main data + private _user: User = { + Authorization: "", + BasicAuthKey: "", + Email: "", + FullName: "", + Profile: "", + RoleDescription: "", + RoleID: 0, + SharedCalendars: [], + OwnerCalendars: [], + UserId: 0, + UserName: "", + } + // local storage keyName + private keyName: string; + + constructor() { + + this.keyName = (SHA1(this.constructor.name)).toString() + let restore = localstoreService.get(this.keyName, {}) + this._user = restore.user || new User() + + } + + get user(): User { + return this._user || new User() + } + + reset(user) { + this._user = user + + this.save(this._user) + } + + private save(user) { + setTimeout(()=>{ + localstoreService.set(this.keyName,{ + user, + }) + }, 10) + + } +} + +export const UserStore = new UserService() From 630fe0b1fb64bc37b01789103e7f063add135b42 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 29 Jul 2021 20:40:04 +0100 Subject: [PATCH 07/11] Add user role service validation --- src/app/OtherService/permission.service.ts | 11 ++++++++--- .../pages/gabinete-digital/gabinete-digital.page.html | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/app/OtherService/permission.service.ts b/src/app/OtherService/permission.service.ts index 0b983736a..760951a1b 100644 --- a/src/app/OtherService/permission.service.ts +++ b/src/app/OtherService/permission.service.ts @@ -13,21 +13,26 @@ export class PermissionService { userRole(args) { let data: string[] = [] - if(!Array.isArray(args) && typeof(args) == 'string') { + if(!Array.isArray(args) && typeof(args) == 'string') { data = [args] + } else { + data = args } + console.log('==!!==',data, this.userStore.user.Profile) return data.includes(this.userStore.user.Profile) } role(args: any) { + let UserRoleIsValid = this.userRole(args) return { permissionAnyOf(role) { - if(!Array.isArray(role) && typeof(role) == 'string') { - role = [role] + + if(!Array.isArray(args) && typeof(args) == 'string') { + role = [args] } if(!UserRoleIsValid) {return false } diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index ca17c7c36..bd3cfa790 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -90,7 +90,7 @@

{{ despachoprstore.count }} Documentos

-
+
From 7a2549cf3f3b9c3782da902ada307c1b11720873 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 29 Jul 2021 20:43:05 +0100 Subject: [PATCH 08/11] Remove console --- src/app/OtherService/permission.service.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/OtherService/permission.service.ts b/src/app/OtherService/permission.service.ts index 760951a1b..a09dafb53 100644 --- a/src/app/OtherService/permission.service.ts +++ b/src/app/OtherService/permission.service.ts @@ -19,7 +19,6 @@ export class PermissionService { data = args } - console.log('==!!==',data, this.userStore.user.Profile) return data.includes(this.userStore.user.Profile) } From a3b7a9432f079e7ca445288f8cb5bee283929651 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 29 Jul 2021 20:51:31 +0100 Subject: [PATCH 09/11] Update localstorage version --- src/app/pages/gabinete-digital/gabinete-digital.page.html | 1 + src/app/store/localstore.service.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index bd3cfa790..92e3a07c5 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -96,6 +96,7 @@
+ dd

Expediente Presidente

Expediente

{{expedienteprstore.count}} Documentos

diff --git a/src/app/store/localstore.service.ts b/src/app/store/localstore.service.ts index 995034584..972270a16 100644 --- a/src/app/store/localstore.service.ts +++ b/src/app/store/localstore.service.ts @@ -6,7 +6,7 @@ import { AES, enc, SHA1 } from 'crypto-js' }) export class LocalstoreService { - private prefix = 'v12-' + private prefix = 'v13-' constructor() { From 7c0e1dcf814e8fca72af50f33c62ca7995c20265 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 29 Jul 2021 20:51:53 +0100 Subject: [PATCH 10/11] improve --- src/app/pages/gabinete-digital/gabinete-digital.page.html | 1 - 1 file changed, 1 deletion(-) diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 92e3a07c5..bd3cfa790 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -96,7 +96,6 @@
- dd

Expediente Presidente

Expediente

{{expedienteprstore.count}} Documentos

From 0ca64d0c353bb98bde2055c3bf5e85957a26545b Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 30 Jul 2021 07:17:35 +0100 Subject: [PATCH 11/11] Improve Agenda colors --- src/app/store/localstore.service.ts | 16 ++++++++++++++++ src/global.scss | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/app/store/localstore.service.ts b/src/app/store/localstore.service.ts index 972270a16..fb4a9edb7 100644 --- a/src/app/store/localstore.service.ts +++ b/src/app/store/localstore.service.ts @@ -58,3 +58,19 @@ export class LocalstoreService { } export const localstoreService = new LocalstoreService() + + + +// Create WebSocket connection. +const socket = new WebSocket('ws://localhost:8080'); + +// Listen for messages +socket.addEventListener('message', function (event) { + console.log('Message from server ', event.data); // Message from server mobile first é fraco + + var p = Promise.resolve(event.data); + p.then(function(v) { + console.log(v); // mobile first é fraco + }); + +}); \ No newline at end of file diff --git a/src/global.scss b/src/global.scss index d9a78637f..8dd6649de 100644 --- a/src/global.scss +++ b/src/global.scss @@ -1071,7 +1071,7 @@ ngx-mat-datetime-content{ } -@media only screen and (max-width: 1024px) { +@media only screen and (max-width: 767px) { .calendar-segment-mdgpr:not(.calendar-segment-pr-force) { .calendar-pr-event-type-Oficial { border-right: 3px solid transparent !important;