-
-
+ >
diff --git a/src/app/modals/view-media/view-media.page.ts b/src/app/modals/view-media/view-media.page.ts
index 58bfdd636..d32ce54fb 100644
--- a/src/app/modals/view-media/view-media.page.ts
+++ b/src/app/modals/view-media/view-media.page.ts
@@ -1,6 +1,7 @@
import { Component, OnInit } from '@angular/core';
import { ModalController, NavParams } from '@ionic/angular';
import { DomSanitizer} from '@angular/platform-browser';
+import { pdfDefaultOptions } from 'ngx-extended-pdf-viewer';
@Component({
selector: 'app-view-media',
@@ -19,29 +20,55 @@ export class ViewMediaPage implements OnInit {
maxRation: 2
};
- base64Sanitize:any = "";
+ base64Sanitize = "";
constructor(
private modalController: ModalController,
private navParams:NavParams,
public sanitizer: DomSanitizer,
+
) {
this.image = this.navParams.get('image')
this.type = this.navParams.get('type')
this.name = this.navParams.get('username')
this._updatedAt = this.navParams.get('_updatedAt')
+ pdfDefaultOptions.assetsFolder = 'bleeding-edge';
}
ngOnInit() {
console.log(this.image)
- this.base64Sanitize = this.sanitizer.bypassSecurityTrustResourceUrl(eval(this.image));
+
+
+ const encodedData = btoa(this.image);
+ const blob = new Blob([this.b64toBlob(encodedData)], { type: 'application/pdf' });
+ this.base64Sanitize = URL.createObjectURL(blob);
+ //this.base64Sanitize = this.sanitizer.bypassSecurityTrustResourceUrl(this.base64Sanitize);
+ this.base64Sanitize;
console.log(this.base64Sanitize)
}
- sanitizeBase64() {
- return this.sanitizer.bypassSecurityTrustResourceUrl(this.image);
- }
+ b64toBlob = (b64Data, contentType = '', sliceSize = 512) => {
+ const byteCharacters = atob(b64Data);
+ const byteArrays = [];
+
+ for (let offset = 0; offset < byteCharacters.length; offset += sliceSize) {
+ const slice = byteCharacters.slice(offset, offset + sliceSize);
+
+ const byteNumbers = new Array(slice.length);
+ for (let i = 0; i < slice.length; i++) {
+ byteNumbers[i] = slice.charCodeAt(i);
+ }
+
+ const byteArray = new Uint8Array(byteNumbers);
+ byteArrays.push(byteArray);
+ }
+
+ const blob = new Blob(byteArrays, { type: contentType });
+ return blob;
+ };
+
+
diff --git a/src/app/models/permission/actions.permission.ts b/src/app/models/permission/actions.permission.ts
new file mode 100644
index 000000000..fcdc95e7c
--- /dev/null
+++ b/src/app/models/permission/actions.permission.ts
@@ -0,0 +1,9 @@
+export class ActionsPermission{
+ access = 534;
+ create = 535;
+ delete = 536;
+ edit = 537;
+ createPost = 538;
+ deletePost = 539;
+ editPost = 540;
+}
diff --git a/src/app/models/permission/agenda-permission.ts b/src/app/models/permission/agenda-permission.ts
new file mode 100644
index 000000000..bb3afb868
--- /dev/null
+++ b/src/app/models/permission/agenda-permission.ts
@@ -0,0 +1,3 @@
+export class AgendaPermission{
+ access = 530
+}
diff --git a/src/app/models/permission/chat-permission.ts b/src/app/models/permission/chat-permission.ts
new file mode 100644
index 000000000..4f780e33c
--- /dev/null
+++ b/src/app/models/permission/chat-permission.ts
@@ -0,0 +1,3 @@
+export class ChatPermission{
+ access = 541;
+}
diff --git a/src/app/models/permission/gabinete-permission.ts b/src/app/models/permission/gabinete-permission.ts
new file mode 100644
index 000000000..be9fa5c45
--- /dev/null
+++ b/src/app/models/permission/gabinete-permission.ts
@@ -0,0 +1,5 @@
+export class GabinetePermission{
+ access = 531;
+ pr_tasks = 532;
+ md_tasks = 533;
+}
diff --git a/src/app/models/permission/permissionList.ts b/src/app/models/permission/permissionList.ts
new file mode 100644
index 000000000..43a3fd3b8
--- /dev/null
+++ b/src/app/models/permission/permissionList.ts
@@ -0,0 +1,11 @@
+import { ActionsPermission } from "./actions.permission";
+import { AgendaPermission } from "./agenda-permission";
+import { ChatPermission } from "./chat-permission";
+import { GabinetePermission } from "./gabinete-permission";
+
+export class PermissionList{
+ Agenda = new AgendaPermission();
+ Gabinete = new GabinetePermission();
+ Actions = new ActionsPermission();
+ Chat = new ChatPermission();
+}
diff --git a/src/app/models/permissionList.ts b/src/app/models/permissionList.ts
deleted file mode 100644
index cfaf80f57..000000000
--- a/src/app/models/permissionList.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export class PermissionList{
- Agenda = 530;
- Gabinete = 531;
- Actions = 534;
- Chat = 541;
-}
diff --git a/src/app/pages/agenda/agenda-routing.module.ts b/src/app/pages/agenda/agenda-routing.module.ts
index b177d8a24..dd917765c 100644
--- a/src/app/pages/agenda/agenda-routing.module.ts
+++ b/src/app/pages/agenda/agenda-routing.module.ts
@@ -1,42 +1,46 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-
-import { AgendaPage } from './agenda.page';
-
-const routes: Routes = [
- {
- path: '',
- component: AgendaPage
- },
- {
- path: 'approve-event-modal',
- loadChildren: () => import('../gabinete-digital/event-list/approve-event-modal/approve-event-modal.module').then( m => m.ApproveEventModalPageModule)
- },
- {
- path: 'event-actions-popover',
- loadChildren: () => import('./event-actions-popover/event-actions-popover.module').then( m => m.EventActionsPopoverPageModule)
- },
- {
- path: 'emend-message-modal',
- loadChildren: () => import('./emend-message-modal/emend-message-modal.module').then( m => m.EmendMessageModalPageModule)
- },
- {
- path: 'new-event',
- loadChildren: () => import('./new-event/new-event.module').then( m => m.NewEventPageModule)
- },
- {
- path: 'edit-event',
- loadChildren: () => import('./edit-event/edit-event.module').then( m => m.EditEventPageModule)
- },
- {
- path: 'view-event',
- loadChildren: () => import('./view-event/view-event.module').then( m => m.ViewEventPageModule)
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { AgendaPage } from './agenda.page';
+
+const routes: Routes = [
+ {
+ path: '',
+ component: AgendaPage
+ },
+ {
+ path: 'approve-event-modal',
+ loadChildren: () => import('../gabinete-digital/event-list/approve-event-modal/approve-event-modal.module').then( m => m.ApproveEventModalPageModule)
+ },
+ {
+ path: 'event-actions-popover',
+ loadChildren: () => import('./event-actions-popover/event-actions-popover.module').then( m => m.EventActionsPopoverPageModule)
+ },
+ {
+ path: 'emend-message-modal',
+ loadChildren: () => import('./emend-message-modal/emend-message-modal.module').then( m => m.EmendMessageModalPageModule)
+ },
+ {
+ path: 'new-event',
+ loadChildren: () => import('./new-event/new-event.module').then( m => m.NewEventPageModule)
+ },
+ {
+ path: 'edit-event',
+ loadChildren: () => import('./edit-event/edit-event.module').then( m => m.EditEventPageModule)
+ },
+ {
+ path: 'view-event',
+ loadChildren: () => import('./view-event/view-event.module').then( m => m.ViewEventPageModule)
+ },
{
+ path: 'evandre',
+ loadChildren: () => import('./evandre/evandre.module').then( m => m.EvandrePageModule)
}
-];
-
-@NgModule({
- imports: [RouterModule.forChild(routes)],
- exports: [RouterModule],
-})
-export class AgendaPageRoutingModule {}
+
+];
+
+@NgModule({
+ imports: [RouterModule.forChild(routes)],
+ exports: [RouterModule],
+})
+export class AgendaPageRoutingModule {}
diff --git a/src/app/pages/agenda/evandre/evandre-routing.module.ts b/src/app/pages/agenda/evandre/evandre-routing.module.ts
new file mode 100644
index 000000000..3fb00a40b
--- /dev/null
+++ b/src/app/pages/agenda/evandre/evandre-routing.module.ts
@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { EvandrePage } from './evandre.page';
+
+const routes: Routes = [
+ {
+ path: '',
+ component: EvandrePage
+ }
+];
+
+@NgModule({
+ imports: [RouterModule.forChild(routes)],
+ exports: [RouterModule],
+})
+export class EvandrePageRoutingModule {}
diff --git a/src/app/pages/agenda/evandre/evandre.module.ts b/src/app/pages/agenda/evandre/evandre.module.ts
new file mode 100644
index 000000000..8a20cd1c2
--- /dev/null
+++ b/src/app/pages/agenda/evandre/evandre.module.ts
@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+
+import { IonicModule } from '@ionic/angular';
+
+import { EvandrePageRoutingModule } from './evandre-routing.module';
+
+import { EvandrePage } from './evandre.page';
+
+@NgModule({
+ imports: [
+ CommonModule,
+ FormsModule,
+ IonicModule,
+ EvandrePageRoutingModule
+ ],
+ declarations: [EvandrePage]
+})
+export class EvandrePageModule {}
diff --git a/src/app/pages/agenda/evandre/evandre.page.html b/src/app/pages/agenda/evandre/evandre.page.html
new file mode 100644
index 000000000..0cc537051
--- /dev/null
+++ b/src/app/pages/agenda/evandre/evandre.page.html
@@ -0,0 +1,9 @@
+
-
+
+
{{ task.Folio}}
-
@@ -106,7 +106,7 @@
-
+
@@ -115,7 +115,7 @@
-
+
diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
index 719139cf0..66d55bad0 100644
--- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
@@ -63,7 +63,7 @@ export class DespachoPage implements OnInit {
private sqliteservice: SqliteService,
private platform: Platform,
private backgroundservice: BackgroundService,
- public ThemeService: ThemeService
+ public ThemeService: ThemeService,
) {
diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
index 9d96e8231..da21dfe05 100644
--- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
@@ -90,26 +90,26 @@
-
+
-
-
+
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index 71556f4dc..27cdc2ed7 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -101,7 +101,7 @@
{{ allProcessesList.length }} Documentos
+
- Pendentes
-Meus Pendentes
+Pendentes
+Meus Pendentes
{{pendentesstore.count}} Documentos
+
-->
- Despacho do Presidente da República
-Despachos criados por mim
+Despacho do Presidente da República
+Despachos criados por mim
{{ despachoprstore.count }} Documentos
+
Pedidos de Parecer
-Pedidos de Parecer solicitados por mim
+Pedidos de Parecer
+Pedidos de Parecer solicitados por mim
{{pedidosstore.countparecer}} Documentos
+
-
+
Diplomas por Validar
-Diplomas por Assinar
+Diplomas por Validar
+Diplomas por Assinar
{{ deplomasStore.deplomasReviewCount }} Documentos
+
Diplomas assinados PR
-Diplomas
+Diplomas assinados PR
+Diplomas
{{ deplomasStore.countDiplomasAssinadoListCount }} Documentos
+
-
+
-
+
diff --git a/src/app/pages/publications/publications.page.ts b/src/app/pages/publications/publications.page.ts
index 77f1df29a..4baeee66c 100644
--- a/src/app/pages/publications/publications.page.ts
+++ b/src/app/pages/publications/publications.page.ts
@@ -15,6 +15,7 @@ import { SqliteService } from 'src/app/services/sqlite.service';
import { BackgroundService } from 'src/app/services/background.service';
import { ThemeService } from 'src/app/services/theme.service'
import { Storage } from '@ionic/storage';
+import { PermissionService } from 'src/app/services/permission.service';
@Component({
@@ -68,7 +69,8 @@ export class PublicationsPage implements OnInit {
private backgroundservice: BackgroundService,
private platform: Platform,
public ThemeService: ThemeService,
- private storage: Storage
+ private storage: Storage,
+ public p: PermissionService,
) {
this.months = ["Janeiro", "Fevereiro", "Março", "Abril", "Maio", "Junho", "Julho", "Agosto", "Setembro", "Outubro", "Novembro", "Dezembro"];
diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html
index dd6e0bbb6..7b06bd70d 100644
--- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html
+++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.html
@@ -61,12 +61,12 @@
-
+
-
+
diff --git a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts
index 15afbe6e2..9929de9ef 100644
--- a/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts
+++ b/src/app/pages/publications/view-publications/publication-detail/publication-detail.page.ts
@@ -10,6 +10,7 @@ import { Location } from '@angular/common';
import { ThemeService } from 'src/app/services/theme.service'
import { ViewMediaPage } from 'src/app/modals/view-media/view-media.page';
import { RouteService } from 'src/app/services/route.service';
+import { PermissionService } from 'src/app/services/permission.service';
@Component({
selector: 'app-publication-detail',
@@ -31,7 +32,8 @@ export class PublicationDetailPage implements OnInit {
private activatedRoute: ActivatedRoute,
private router: Router,
private RouteService: RouteService,
- public ThemeService: ThemeService
+ public ThemeService: ThemeService,
+ public p:PermissionService,
) {
this.activatedRoute.paramMap.subscribe(params => {
diff --git a/src/app/pages/publications/view-publications/view-publications.page.html b/src/app/pages/publications/view-publications/view-publications.page.html
index 91e993b76..8ed7372e8 100644
--- a/src/app/pages/publications/view-publications/view-publications.page.html
+++ b/src/app/pages/publications/view-publications/view-publications.page.html
@@ -15,7 +15,7 @@
-
@@ -127,7 +127,7 @@
-
+
{{item.Detail}}
{{item.DateBegin | date: 'dd-MM-yy | HH:mm'}}
+
![]()
-
+
![]()
diff --git a/src/app/pages/publications/view-publications/view-publications.page.ts b/src/app/pages/publications/view-publications/view-publications.page.ts
index b8c63dfb3..5a7bb8264 100644
--- a/src/app/pages/publications/view-publications/view-publications.page.ts
+++ b/src/app/pages/publications/view-publications/view-publications.page.ts
@@ -12,6 +12,7 @@ import { BackgroundService } from 'src/app/services/background.service';
import { ThemeService } from 'src/app/services/theme.service'
import { forkJoin } from 'rxjs';
import { ToastService } from 'src/app/services/toast.service';
+import { PermissionService } from 'src/app/services/permission.service';
@Component({
selector: 'app-view-publications',
@@ -42,7 +43,8 @@ export class ViewPublicationsPage implements OnInit {
private sqliteservice: SqliteService,
private backgroundservice: BackgroundService,
public ThemeService: ThemeService,
- private toastService: ToastService,) {
+ private toastService: ToastService,
+ public p: PermissionService,) {
this.item = new PublicationFolder();
this.activatedRoute.paramMap.subscribe(params => {
@@ -259,7 +261,7 @@ export class ViewPublicationsPage implements OnInit {
publicationArray.push(publicationlis);
});
-
+
this.publicationList = publicationArray;
})
}
diff --git a/src/app/services/chat/chat-methods.service.ts b/src/app/services/chat/chat-methods.service.ts
index 61e446163..379d048b5 100644
--- a/src/app/services/chat/chat-methods.service.ts
+++ b/src/app/services/chat/chat-methods.service.ts
@@ -47,13 +47,8 @@ export class ChatMethodsService {
return this.chatService.sendMessage(body)
}
-
deleteMessage(body) {
return this.chatService.deleteMessage(body)
}
-
-
-
-
}
\ No newline at end of file
diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts
index e4bdcc206..de1e78de2 100644
--- a/src/app/services/chat/message.service.ts
+++ b/src/app/services/chat/message.service.ts
@@ -12,6 +12,7 @@ import { MessageModel, DeleteMessageModel } from '../../models/beast-orm'
import { AESEncrypt } from '../aesencrypt.service'
import { HttpClient, HttpEventType } from '@angular/common/http';
import { AttachmentsService } from 'src/app/services/attachments.service';
+import { NetworkServiceService , ConnectionStatus} from 'src/app/services/network-service.service';
@Injectable({
providedIn: 'root'
@@ -62,7 +63,8 @@ export class MessageService {
private ChatStorageService: ChatStorageService,
private ChatMethodsService: ChatMethodsService,
private AESEncrypt: AESEncrypt,
- private AttachmentsService: AttachmentsService,) {
+ private AttachmentsService: AttachmentsService,
+ private NetworkServiceService: NetworkServiceService) {
}
setData({customFields = {}, channels, mentions, msg ,rid ,ts, u, t, _id, id, _updatedAt, file, attachments, temporaryData, localReference , viewed = [], received = [], delate = false, delateRequest =false, }:Message) {
@@ -184,24 +186,30 @@ export class MessageService {
delete params?.attachments?.image_url
}
- this.ChatMethodsService.send(params).subscribe(
- (response: any) => {
- const ChatMessage = response.message
- this.messageSend = true
- this.redefinedMessage(ChatMessage)
- },
- (error) => {
- this.WsChatService.registerCallback({
- type: 'reConnect',
- funx: async ()=> {
- this.send()
- return true
- }
- })
- }
- )
+ if(this.NetworkServiceService.getCurrentNetworkStatus() == ConnectionStatus.Online) {
+
+ this.WsChatService.send(params).then(
+ (ChatMessage: any) => {
+ ChatMessage = ChatMessage.message.result
+
+ this.messageSend = true
+ this.redefinedMessage(ChatMessage)
+ }
+ )
+
+ } else {
+ this.WsChatService.registerCallback({
+ type: 'reConnect',
+ funx: async ()=> {
+
+ this.send()
+ return true
+ }
+ })
+ }
+
}
async redefinedMessage(ChatMessage , update = true) {
diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts
index b5099f4fe..80fcab564 100644
--- a/src/app/services/chat/room.service.ts
+++ b/src/app/services/chat/room.service.ts
@@ -22,6 +22,7 @@ import { DeleteMessageModel, MessageModel } from '../../models/beast-orm'
import { AESEncrypt } from '../aesencrypt.service'
import { IncomingChatMessage, ChatMessageInterface, falseTypingMethod } from 'src/app/models/message.model';
import { AttachmentsService } from 'src/app/services/attachments.service';
+import { ConnectionStatus, NetworkServiceService} from 'src/app/services/network-service.service';
@Injectable({
providedIn: 'root'
@@ -77,18 +78,16 @@ export class RoomService {
private ChatStorageService: ChatStorageService,
private ChatMethodsService: ChatMethodsService,
private AESEncrypt: AESEncrypt,
- private AttachmentsService: AttachmentsService
+ private AttachmentsService: AttachmentsService,
+ private NetworkServiceService: NetworkServiceService
) {
this.NativeNotificationService.askForPermission()
- // this.restoreMessageFromDB()
-
this.WsChatService.getUserStatus((d) => {
const userId = d.fields.args[0][0]
const statusNum = d.fields.args[0][2]
const statusText = this.statusNumberToText(statusNum)
- //
if(this.members?.map) {
const membersIds = this.members.map((user)=> user._id)
@@ -145,7 +144,7 @@ export class RoomService {
}
}
- setData({members, u, customFields = {}, id, name, t, lastMessage = new MessageService(this.storage, this.NfService, this.WsChatService, this.ChatStorageService, this.ChatMethodsService, this.AESEncrypt, this.AttachmentsService), _updatedAt }) {
+ setData({members, u, customFields = {}, id, name, t, lastMessage = new MessageService(this.storage, this.NfService, this.WsChatService, this.ChatStorageService, this.ChatMethodsService, this.AESEncrypt, this.AttachmentsService, this.NetworkServiceService), _updatedAt }) {
this.customFields = customFields
this.id = id
this.name = name
@@ -343,7 +342,6 @@ export class RoomService {
}
-
async receiveMessageDelete() {
this.WsChatService.updateRoomEventss(
@@ -372,14 +370,6 @@ export class RoomService {
if(this.messages[i]?._id == id ) {
-
- //Get previous last message from room
- const previousLastMessage = this.messages.slice(-1)[0];
- this.lastMessage = previousLastMessage;
-
- this.calDateDuration(previousLastMessage._updatedAt)
- this.sortRoomList()
-
if (SessionStore.user.RochetChatUser == this.messages[i]?.u?.username) {
const allMemberThatIsOffline = this.getAllMemberThatIsOffline()
@@ -393,10 +383,14 @@ export class RoomService {
}
this.messages[i]?.delateDB()
-
- // console.log(_id,'==',this.messages[i]?._id, true)
this.messages.splice(i, 1)
+ //Get previous last message from room
+ const previousLastMessage = this.messages.slice(-1)[0];
+ this.lastMessage = previousLastMessage;
+ this.calDateDuration(previousLastMessage._updatedAt)
+ this.sortRoomList()
+
return true
} else {
@@ -429,40 +423,28 @@ export class RoomService {
const message = this.messages.find((e)=>e._id == msgId)
await message.delateStatusFalse()
- this.ChatMethodsService.deleteMessage({_id:msgId, msgId:msgId, roomId:message.rid}).subscribe(
- async (response: any) => {
-
+ if(this.NetworkServiceService.getCurrentNetworkStatus() == ConnectionStatus.Online) {
+
+ this.WsChatService.deleteMessage(msgId).then(async() => {
message.delateRequest = true
await message.save()
this.deleteMessage(msgId)
+ })
- },
- async (response) => {
-
- if (response?.error?.error.startsWith('No message found with the id of')) {
+ } else {
+ this.WsChatService.registerCallback({
+ type: 'reConnect',
+ funx: async ()=> {
- this.deleteMessage(msgId)
- message.delateRequest = true
- await message.save()
-
- } else {
- this.WsChatService.registerCallback({
- type: 'reConnect',
- funx: async ()=> {
-
- this.sendDeleteRequest(msgId)
- return true
- }
- })
+ this.sendDeleteRequest(msgId)
+ return true
}
-
- }
- )
+ })
+ }
}
-
/**
* @description sen text message
*/
@@ -629,7 +611,7 @@ export class RoomService {
await this.WsChatService.loadHistory(this.id, limit).then( async (chatHistory:chatHistory) => {
- console.log('load chatHistory', JSON.stringify(chatHistory))
+ // console.log('load chatHistory', JSON.stringify(chatHistory))
const messagesId = this.messages.map((message)=> message._id)
@@ -685,7 +667,7 @@ export class RoomService {
message = this.fix_updatedAt(message)
- const wewMessage = new MessageService(this.storage, this.NfService, this.WsChatService, this.ChatStorageService, this.ChatMethodsService, this.AESEncrypt, this.AttachmentsService)
+ const wewMessage = new MessageService(this.storage, this.NfService, this.WsChatService, this.ChatStorageService, this.ChatMethodsService, this.AESEncrypt, this.AttachmentsService, this.NetworkServiceService)
wewMessage.setData(message)
wewMessage.loadHistory = this.hasLoadHistory
@@ -742,7 +724,7 @@ export class RoomService {
async prepareCreate({message, save = true}): Promise {
message = this.fix_updatedAt(message)
- const wewMessage = new MessageService(this.storage, this.NfService, this.WsChatService, this.ChatStorageService, this.ChatMethodsService, this.AESEncrypt, this.AttachmentsService)
+ const wewMessage = new MessageService(this.storage, this.NfService, this.WsChatService, this.ChatStorageService, this.ChatMethodsService, this.AESEncrypt, this.AttachmentsService, this.NetworkServiceService)
wewMessage.setData(message)
wewMessage.loadHistory = this.hasLoadHistory
@@ -754,7 +736,7 @@ export class RoomService {
simplePrepareMessage(message) {
message = this.fix_updatedAt(message)
- const wewMessage = new MessageService(this.storage, this.NfService, this.WsChatService, this.ChatStorageService, this.ChatMethodsService, this.AESEncrypt, this.AttachmentsService)
+ const wewMessage = new MessageService(this.storage, this.NfService, this.WsChatService, this.ChatStorageService, this.ChatMethodsService, this.AESEncrypt, this.AttachmentsService, this.NetworkServiceService)
wewMessage.setData(message)
wewMessage.loadHistory = this.hasLoadHistory
diff --git a/src/app/services/chat/ws-chat-methods.service.ts b/src/app/services/chat/ws-chat-methods.service.ts
index db3e320d7..82dae5b98 100644
--- a/src/app/services/chat/ws-chat-methods.service.ts
+++ b/src/app/services/chat/ws-chat-methods.service.ts
@@ -20,6 +20,7 @@ import { ChatStorageService } from './chat-storage.service'
import { ChatMethodsService } from './chat-methods.service'
import { AESEncrypt } from '../aesencrypt.service'
import { AttachmentsService } from 'src/app/services/attachments.service';
+import { NetworkServiceService} from 'src/app/services/network-service.service';
@Injectable({
providedIn: 'root'
@@ -57,7 +58,8 @@ export class WsChatMethodsService {
private ChatStorageService: ChatStorageService,
private ChatMethodsService:ChatMethodsService,
private AESEncrypt: AESEncrypt,
- private AttachmentsService:AttachmentsService
+ private AttachmentsService:AttachmentsService,
+ private NetworkServiceService: NetworkServiceService
) {
this.loggedUser = authService.ValidatedUserChat['data'];
@@ -314,7 +316,7 @@ export class WsChatMethodsService {
// create room
if(!this.roomExist(roomId)) {
- let room:RoomService = new RoomService(this.WsChatService, new MessageService(this.storage, this.NfService, this.WsChatService, this.ChatStorageService, this.ChatMethodsService, this.AESEncrypt, this.AttachmentsService), this.storage, this.platform, this.sqlservice, this.NativeNotificationService, this.sortService, this.ChatService, this.NfService , this.ChatStorageService, this.ChatMethodsService, this.AESEncrypt, this.AttachmentsService)
+ let room:RoomService = new RoomService(this.WsChatService, new MessageService(this.storage, this.NfService, this.WsChatService, this.ChatStorageService, this.ChatMethodsService, this.AESEncrypt, this.AttachmentsService, this.NetworkServiceService), this.storage, this.platform, this.sqlservice, this.NativeNotificationService, this.sortService, this.ChatService, this.NfService , this.ChatStorageService, this.ChatMethodsService, this.AESEncrypt, this.AttachmentsService, this.NetworkServiceService)
room.setData(setData)
room.receiveMessage()
room.getAllUsers = this.getUsers
diff --git a/src/app/services/network-service.service.spec.ts b/src/app/services/network-service.service.spec.ts
new file mode 100644
index 000000000..987fc15ec
--- /dev/null
+++ b/src/app/services/network-service.service.spec.ts
@@ -0,0 +1,16 @@
+import { TestBed } from '@angular/core/testing';
+
+import { NetworkServiceService } from './network-service.service';
+
+describe('NetworkServiceService', () => {
+ let service: NetworkServiceService;
+
+ beforeEach(() => {
+ TestBed.configureTestingModule({});
+ service = TestBed.inject(NetworkServiceService);
+ });
+
+ it('should be created', () => {
+ expect(service).toBeTruthy();
+ });
+});
diff --git a/src/app/services/network-service.service.ts b/src/app/services/network-service.service.ts
new file mode 100644
index 000000000..8e5e32d36
--- /dev/null
+++ b/src/app/services/network-service.service.ts
@@ -0,0 +1,62 @@
+import { Injectable } from '@angular/core';
+import { ToastController, Platform } from '@ionic/angular';
+import { BehaviorSubject, Observable } from 'rxjs';
+import { Network } from '@ionic-native/network/ngx'
+
+
+export enum ConnectionStatus {
+ Online,
+ Offline
+}
+
+
+@Injectable({
+ providedIn: 'root'
+})
+export class NetworkServiceService {
+ private status: BehaviorSubject = new BehaviorSubject(ConnectionStatus.Offline);
+
+ constructor(private network: Network, private toastController: ToastController, private plt: Platform) {
+ this.plt.ready().then(() => {
+ this.initializeNetworkEvents();
+ let status = this.network.type !== 'none' ? ConnectionStatus.Online : ConnectionStatus.Offline;
+ this.status.next(status);
+ });
+
+ }
+
+ public initializeNetworkEvents() {
+
+ this.network.onDisconnect().subscribe(() => {
+ if (this.status.getValue() === ConnectionStatus.Online) {
+ this.updateNetworkStatus(ConnectionStatus.Offline);
+ }
+ });
+
+ this.network.onConnect().subscribe(() => {
+ if (this.status.getValue() === ConnectionStatus.Offline) {
+ this.updateNetworkStatus(ConnectionStatus.Online);
+ }
+ });
+ }
+
+ private async updateNetworkStatus(status: ConnectionStatus) {
+ this.status.next(status);
+
+ let connection = status == ConnectionStatus.Offline ? 'Offline' : 'Online';
+ let toast = this.toastController.create({
+ message: `You are now ${connection}`,
+ duration: 3000,
+ position: 'bottom'
+ });
+ toast.then(toast => toast.present());
+ }
+
+ public onNetworkChange(): Observable {
+ return this.status.asObservable();
+ }
+
+ public getCurrentNetworkStatus(): ConnectionStatus {
+ return this.status.getValue();
+ }
+}
diff --git a/src/app/services/permission.service.ts b/src/app/services/permission.service.ts
index 3587a5dc6..b0ebcf48f 100644
--- a/src/app/services/permission.service.ts
+++ b/src/app/services/permission.service.ts
@@ -1,4 +1,5 @@
import { Injectable } from '@angular/core';
+import { PermissionList } from '../models/permission/permissionList';
import { SessionStore } from '../store/session.service';
@Injectable({
@@ -6,6 +7,7 @@ import { SessionStore } from '../store/session.service';
})
export class PermissionService {
+ permissionList = new PermissionList();
SessionStore = SessionStore
constructor() { }
@@ -20,19 +22,17 @@ export class PermissionService {
}
userPermission(args) {
-
if(!Array.isArray(args)) {
args = [args]
}
- for(let permission of (this.SessionStore.user.UserPermissions || [])){
- if (args.includes(permission)){
+ for(let permission of (this.SessionStore.user.UserPermissions || [])) {
+ if (args.includes(permission)) {
return true;
}
}
return false;
-
}
role(args: any) {
@@ -46,7 +46,7 @@ export class PermissionService {
role = [role]
}
- if(!UserRoleIsValid) {return false }
+ if(!UserRoleIsValid) { return false }
return true
diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts
index 829ce53d3..46f3658e9 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -152,9 +152,6 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
}
ngOnInit() {
- console.log(this.roomId);
- this.loggedUser = this.loggedUserChat;
-
this.loggedUser=this.loggedUserChat;
setTimeout(() => {
this.getRoomInfo();
diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html
index 7769fc17e..06d76d173 100644
--- a/src/app/shared/header/header.page.html
+++ b/src/app/shared/header/header.page.html
@@ -66,7 +66,7 @@
-
+
+
+
+
+
+
@@ -60,7 +60,7 @@
-
+
diff --git a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.html b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.html
index f46731c61..1bf5ad3aa 100644
--- a/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.html
+++ b/src/app/shared/popover/despachos-pr-options/despachos-pr-options.page.html
@@ -9,27 +9,27 @@
+
+
@@ -51,7 +51,7 @@
-
+
-
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
-
+
+
-
-
-
-
+
+
+
+
-