+
+
+
+
+
@@ -26,7 +28,7 @@
-
diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts
index 7aa457d15..55fe93adf 100644
--- a/src/app/pages/publications/publications.page.ts
+++ b/src/app/pages/publications/publications.page.ts
@@ -108,7 +108,6 @@ export class PublicationsPage implements OnInit {
doRefresh(event) {
this.getActions();
-
setTimeout(() => {
event.target.complete();
}, 250);
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
@@ -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,
diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html
index 661c018a5..cdb91520e 100644
--- a/src/app/shared/header/header.page.html
+++ b/src/app/shared/header/header.page.html
@@ -10,13 +10,9 @@
-
-
-
-
+
diff --git a/src/app/shared/headers/header-no-search/header-no-search.page.html b/src/app/shared/headers/header-no-search/header-no-search.page.html
index 74a519cd3..34bb5da6d 100644
--- a/src/app/shared/headers/header-no-search/header-no-search.page.html
+++ b/src/app/shared/headers/header-no-search/header-no-search.page.html
@@ -9,9 +9,9 @@
+ {{loggeduser.Profile}}
-
diff --git a/src/app/store/localstore.service.ts b/src/app/store/localstore.service.ts
index 995034584..fb4a9edb7 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() {
@@ -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/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()
diff --git a/src/global.scss b/src/global.scss
index 5469ff27b..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;
@@ -1090,3 +1090,8 @@ ngx-mat-datetime-content{
}
}
}
+
+
+.modal-background {
+ background: #0000006b;
+}
\ No newline at end of file
+ {{loggeduser.Profile}}