-
-
- 
+
+
+
+
+ 
+ 
+
+
+
+
+
+
+
+
+ Presidente da República
+ +GABINETE DIGITAL
+
+
+
Presidente da República
+ +GABINETE DIGITAL
+
diff --git a/src/app/modals/profile/edit-profile/edit-profile.page.scss b/src/app/modals/profile/edit-profile/edit-profile.page.scss
index 79df9b441..35049c06c 100644
--- a/src/app/modals/profile/edit-profile/edit-profile.page.scss
+++ b/src/app/modals/profile/edit-profile/edit-profile.page.scss
@@ -10,18 +10,68 @@
.div-logo{
background: transparent;
- width: calc(100% - 40px) !important;
+ width: em(140px);
justify-content: center;
display: flex;
+ color: black;
+ overflow: auto;
float: left;
- .logo{
- width: 140px;
- .img{
+ .logo-icon{
+ width: 25.33%;
+ overflow: auto;
+
+ img{
width: 100%;
margin: 0px auto;
}
}
+
+ .logo-description{
+ width: 74.67%;
+ margin: 0 auto;
+ overflow: auto;
+ font-size: 8.5px;
+ font-family: Bahnschrift;
+
+ .logo-description-content{
+ width: 100%;
+
+ .logo-description-text{
+ font-weight: 700;
+ text-align: center;
+ width: 100%;
+ margin: 0 !important;
+ padding: 0 !important;
+ }
+
+ .add-line{
+ width: 100%;
+ border-bottom: 1px solid #000;
+ margin-bottom: 2.5px !important;
+ padding: 0 !important;
+ }
+
+ .add-line-white{
+ width: 100%;
+ border-bottom: 1px solid #fff;
+ margin-bottom: 2.5px !important;
+ padding: 0 !important;
+ }
+ }
+ .color-white{
+ color: #fff !important;
+ }
+
+ .add-botton-border{
+ border-bottom: 1px solid #000;
+ }
+
+ .add-botton-border-white{
+ border-bottom: 1px solid #fff;
+ }
+
+ }
}
}
.btn-close{
diff --git a/src/app/modals/profile/profile.page.html b/src/app/modals/profile/profile.page.html
index 01b6bdc77..0b4d029e5 100644
--- a/src/app/modals/profile/profile.page.html
+++ b/src/app/modals/profile/profile.page.html
@@ -1,8 +1,24 @@
-
{{room.lastMessage.msg}}
- A escrever...
+ está escrever...
@@ -120,8 +122,7 @@
-
-
diff --git a/src/app/models/beast-orm.ts b/src/app/models/beast-orm.ts
new file mode 100644
index 000000000..49809e81f
--- /dev/null
+++ b/src/app/models/beast-orm.ts
@@ -0,0 +1,44 @@
+import { models } from 'beast-orm'
+import { AESEncrypt } from '../services/aesencrypt.service'
+
+const _AESEncrypt = new AESEncrypt()
+const { ArrayField, JsonField} = models.indexedDB.fields
+
+export class MessageModel extends models.Model {
+
+ channels = ArrayField()
+ mentions = ArrayField()
+ msg = models.CharField()
+ rid = models.CharField()
+ ts = models.CharField()
+ u = JsonField()
+ _id = models.CharField({unique:true})
+ _updatedAt = models.CharField()
+ messageSend = models.BooleanField()
+ offline = models.BooleanField()
+ viewed = ArrayField()
+ received = ArrayField()
+ localReference = models.CharField({blank:true})
+ attachments = ArrayField()
+ file = ArrayField()
+
+}
+
+export class DeleteMessageModel extends models.Model {
+
+ messageId = models.IntegerField()
+ rid = models.CharField()
+ ts = models.CharField()
+ u = JsonField()
+ needToReceiveBy = ArrayField()
+
+}
+
+
+
+models.register({
+ databaseName: 'chat-storage',
+ type: 'indexedDB',
+ version: 1,
+ models: [MessageModel, DeleteMessageModel]
+})
\ No newline at end of file
diff --git a/src/app/models/chatMethod.ts b/src/app/models/chatMethod.ts
index 6b455b237..3178d7633 100644
--- a/src/app/models/chatMethod.ts
+++ b/src/app/models/chatMethod.ts
@@ -67,6 +67,7 @@ interface FirstUnread {
export interface Message {
customFields:any;
_id: string;
+ id: null | string;
rid: string;
msg: string;
ts: Ts;
@@ -81,7 +82,11 @@ export interface Message {
editedBy: EditedBy;
urls: any[];
temporaryData: object
- localReference?: string
+ localReference?: string,
+ viewed: string[],
+ received: string[],
+ delate: boolean,
+ delateRequest: boolean
}
@@ -174,159 +179,159 @@ export interface chatHistory {
interface Ts {
- $date: any;
+ $date: any;
}
interface U {
- _id: string;
- username: string;
- name: string;
+ _id: string;
+ username: string;
+ name: string;
}
interface UpdatedAt {
- $date: any;
+ $date: any;
}
interface Attachment {
- ts: Date;
- title_link_download: boolean;
+ ts: Date;
+ title_link_download: boolean;
}
export interface File {
- type: string;
- guid: string;
- image_url: string;
- subject: string;
- start_date?: Date;
- end_date?: Date;
- venue: string;
- id: string;
+ type: string;
+ guid: string;
+ image_url: string;
+ subject: string;
+ start_date?: Date;
+ end_date?: Date;
+ venue: string;
+ id: string;
}
interface EditedAt {
- $date: number;
+ $date: number;
}
interface EditedBy {
- _id: string;
- username: string;
+ _id: string;
+ username: string;
}
interface Ts2 {
- $date: number;
+ $date: number;
}
interface U2 {
- _id: string;
- username: string;
- name: string;
+ _id: string;
+ username: string;
+ name: string;
}
interface UpdatedAt2 {
- $date: number;
+ $date: number;
}
interface FirstUnread {
- _id: string;
- rid: string;
- msg: string;
- ts: Ts2;
- u: U2;
- _updatedAt: string;
- mentions: any[];
- channels: any[];
+ _id: string;
+ rid: string;
+ msg: string;
+ ts: Ts2;
+ u: U2;
+ _updatedAt: string;
+ mentions: any[];
+ channels: any[];
}
export interface Message {
- customFields:any;
- _id: string;
- rid: string;
- msg: string;
- ts: Ts;
- u: U;
- t: string;
- _updatedAt: '';
- mentions: any[];
- channels: any[];
- attachments: Attachment[];
- file: File;
- editedAt: EditedAt;
- editedBy: EditedBy;
- urls: any[];
+ customFields:any;
+ _id: string;
+ rid: string;
+ msg: string;
+ ts: Ts;
+ u: U;
+ t: string;
+ _updatedAt: '';
+ mentions: any[];
+ channels: any[];
+ attachments: Attachment[];
+ file: File;
+ editedAt: EditedAt;
+ editedBy: EditedBy;
+ urls: any[];
}
export interface Lm {
- $date: any;
+ $date: any;
}
export interface LastMessage {
- _id: string;
- rid: string;
- msg: string;
- ts: Ts;
- u: U;
- _updatedAt: UpdatedAt2;
- mentions: any[];
- channels: any[];
- file: File;
- attachments: Attachment[];
+ _id: string;
+ rid: string;
+ msg: string;
+ ts: Ts;
+ u: U;
+ _updatedAt: UpdatedAt2;
+ mentions: any[];
+ channels: any[];
+ file: File;
+ attachments: Attachment[];
}
export interface CustomFields {
}
export interface Update {
- _id: string;
- t: string;
- usernames: string[];
- usersCount: number;
- uids: string[];
- default: boolean;
- ro: boolean;
- sysMes: boolean;
- _updatedAt: UpdatedAt;
- lm: Lm;
- lastMessage: LastMessage;
- name: string;
- fname: string;
- u: U2;
- customFields: CustomFields;
+ _id: string;
+ t: string;
+ usernames: string[];
+ usersCount: number;
+ uids: string[];
+ default: boolean;
+ ro: boolean;
+ sysMes: boolean;
+ _updatedAt: UpdatedAt;
+ lm: Lm;
+ lastMessage: LastMessage;
+ name: string;
+ fname: string;
+ u: U2;
+ customFields: CustomFields;
}
export interface DeletedAt {
- $date: any;
+ $date: any;
}
export interface Remove {
- _id: string;
- _deletedAt: DeletedAt;
+ _id: string;
+ _deletedAt: DeletedAt;
}
export interface Result {
- update: Update[];
- remove: Remove[];
+ update: Update[];
+ remove: Remove[];
}
export interface Rooms {
- msg: string;
- id: string;
- result: Result;
+ msg: string;
+ id: string;
+ result: Result;
}
export interface ChatMessage {
- msg: string;
- id: string;
- result: Message
+ msg: string;
+ id: string;
+ result: Message
}
@@ -334,44 +339,44 @@ export interface ChatMessage {
export interface chatHistory {
- msg: string;
- id: string;
- result: {
- messages: Message[];
- firstUnread: FirstUnread;
- unreadNotLoaded: number;
- };
+ msg: string;
+ id: string;
+ result: {
+ messages: Message[];
+ firstUnread: FirstUnread;
+ unreadNotLoaded: number;
+ };
}
export interface chatUser {
- _id: string;
- createdAt: Date;
- emails: {
- address: string;
- verified: boolean;
- }
- type: string;
- status: string;
- active: boolean;
- _updatedAt: Date;
- roles: string[];
- name: string;
- lastLogin: Date;
- statusConnection: string;
- utcOffset: number;
- username: string;
- __rooms: string[];
- requirePasswordChange?: boolean;
- settings: {
- preferences: {
- language: string;
- };
- };
- nickname: string;
- statusText: string;
- banners: any;
- statusDefault: string;
- language: string;
- avatarOrigin: string;
- avatarETag?: any;
+ _id: string;
+ createdAt: Date;
+ emails: {
+ address: string;
+ verified: boolean;
+ }
+ type: string;
+ status: 'online' | 'offline' | 'away' | 'busy' ;
+ active: boolean;
+ _updatedAt: Date;
+ roles: string[];
+ name: string;
+ lastLogin: Date;
+ statusConnection: string;
+ utcOffset: number;
+ username: string;
+ __rooms: string[];
+ requirePasswordChange?: boolean;
+ settings: {
+ preferences: {
+ language: string;
+ };
+ };
+ nickname: string;
+ statusText: string;
+ banners: any;
+ statusDefault: string;
+ language: string;
+ avatarOrigin: string;
+ avatarETag?: any;
}
\ No newline at end of file
diff --git a/src/app/models/message.model.ts b/src/app/models/message.model.ts
index c6993ebbc..732672370 100644
--- a/src/app/models/message.model.ts
+++ b/src/app/models/message.model.ts
@@ -1,4 +1,54 @@
-export interface Message {
- author: string;
- message: string;
- }
\ No newline at end of file
+export interface IncomingChatMessage {
+ msg: string;
+ collection: string;
+ id: string;
+ fields: {
+ args: {
+ _id: string;
+ rid: string;
+ localReference: string;
+ msg: string;
+ file?: any;
+ ts: {
+ $date: number;
+ };
+ u: {
+ _id: string;
+ username: string;
+ name: string;
+ };
+ _updatedAt: {
+ $date: number;
+ };
+ mentions: any[];
+ channels: any[];
+ } [];
+ }
+ eventName: string;
+
+};
+
+export interface ChatMessageInterface {
+ _id: string;
+ rid: string;
+ localReference: string;
+ msg: string;
+ file?: any;
+ ts: number;
+ u: {
+ _id: string;
+ username: string;
+ name: string;
+ };
+ _updatedAt: number;
+ mentions: any[];
+ channels: any[];
+};
+
+
+
+
+export interface falseTypingMethod{
+ method: 'viewMessage' | 'deleteMessage'
+ params: object
+}
\ No newline at end of file
diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html
index 0c26044cf..699ed9fa2 100644
--- a/src/app/pages/chat/chat.page.html
+++ b/src/app/pages/chat/chat.page.html
@@ -69,16 +69,18 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Presidente da República
+ +GABINETE DIGITAL
+
+
+
Presidente da República
+ +GABINETE DIGITAL
+
@@ -13,7 +29,7 @@
-
+
-
+
{{loggeduser.RoleDescription}}
@@ -37,7 +53,7 @@
diff --git a/src/app/modals/profile/profile.page.scss b/src/app/modals/profile/profile.page.scss
index 5d3981b20..fad53463a 100644
--- a/src/app/modals/profile/profile.page.scss
+++ b/src/app/modals/profile/profile.page.scss
@@ -4,20 +4,70 @@
padding: 20px 20px;
border: 0 !important;
- .div-logo {
+ .div-logo{
background: transparent;
- width: calc(100% - 40px) !important;
+ width: em(140px);
justify-content: center;
display: flex;
+ color: black;
+ overflow: auto;
float: left;
- .logo {
- width: 140px;
- .img {
+ .logo-icon{
+ width: 25.33%;
+ overflow: auto;
+
+ img{
width: 100%;
margin: 0px auto;
}
}
+
+ .logo-description{
+ width: 74.67%;
+ margin: 0 auto;
+ overflow: auto;
+ font-size: 8.5px;
+ font-family: Bahnschrift;
+
+ .logo-description-content{
+ width: 100%;
+
+ .logo-description-text{
+ font-weight: 700;
+ text-align: center;
+ width: 100%;
+ margin: 0 !important;
+ padding: 0 !important;
+ }
+
+ .add-line{
+ width: 100%;
+ border-bottom: 1px solid #000;
+ margin-bottom: 2.5px !important;
+ padding: 0 !important;
+ }
+
+ .add-line-white{
+ width: 100%;
+ border-bottom: 1px solid #fff;
+ margin-bottom: 2.5px !important;
+ padding: 0 !important;
+ }
+ }
+ .color-white{
+ color: #fff !important;
+ }
+
+ .add-botton-border{
+ border-bottom: 1px solid #000;
+ }
+
+ .add-botton-border-white{
+ border-bottom: 1px solid #fff;
+ }
+
+ }
}
}
.btn-close {
diff --git a/src/app/modals/view-media/view-media.module.ts b/src/app/modals/view-media/view-media.module.ts
index 772ba6e59..eb52e9daf 100644
--- a/src/app/modals/view-media/view-media.module.ts
+++ b/src/app/modals/view-media/view-media.module.ts
@@ -8,7 +8,6 @@ import { ViewMediaPageRoutingModule } from './view-media-routing.module';
import { ViewMediaPage } from './view-media.page';
import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
-import { PdfViewerModule } from 'ng2-pdf-viewer';
@NgModule({
imports: [
@@ -17,7 +16,6 @@ import { PdfViewerModule } from 'ng2-pdf-viewer';
IonicModule,
FontAwesomeModule,
ViewMediaPageRoutingModule,
- PdfViewerModule
],
declarations: [ViewMediaPage]
})
diff --git a/src/app/modals/view-media/view-media.page.html b/src/app/modals/view-media/view-media.page.html
index 3334943bd..b4367aac4 100644
--- a/src/app/modals/view-media/view-media.page.html
+++ b/src/app/modals/view-media/view-media.page.html
@@ -24,13 +24,11 @@
-
+
-
+
-
+
-
-
-
+
{{group.name.split('-').join(' ')}}
@@ -131,12 +132,13 @@
-
-->
- {{group.userThatIsTyping}} A escrever ...
-
-
-
{{group.userThatIsTyping}} está escrever ...
+
+
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts
index 744e95d1c..b7670bf96 100644
--- a/src/app/pages/chat/chat.page.ts
+++ b/src/app/pages/chat/chat.page.ts
@@ -20,7 +20,6 @@ import { NewGroupPage } from './new-group/new-group.page';
import { Storage } from '@ionic/storage';
import { EditGroupPage } from 'src/app/shared/chat/edit-group/edit-group.page';
import * as Rx from "rxjs/Rx";
-import { Message } from 'src/app/models/message.model';
import { Observable, Subject } from "rxjs/Rx";
import { NavigationStart, NavigationEnd, Router } from '@angular/router';
import { EventPerson } from 'src/app/models/eventperson.model';
@@ -143,10 +142,6 @@ export class ChatPage implements OnInit {
ngOnInit() {
- console.log('Rooms INDIVIDUAIS',this.wsChatMethodsService._dm);
- console.log(' ROOMS GROUP',this.wsChatMethodsService._group);
-
-
this.segment = "Contactos";
this.authService.userData$.subscribe((res: any) => {
diff --git a/src/app/pages/chat/group-messages/group-messages.module.ts b/src/app/pages/chat/group-messages/group-messages.module.ts
index f6047147e..910c7e4e4 100644
--- a/src/app/pages/chat/group-messages/group-messages.module.ts
+++ b/src/app/pages/chat/group-messages/group-messages.module.ts
@@ -16,6 +16,7 @@ import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
import { ImageCropperModule } from 'ngx-image-cropper';
import { AngularCropperjsModule } from 'angular-cropperjs';
import { LettersAvatarModule } from "ngx-letters-avatar";
+import { PipesModule } from 'src/app/pipes/pipes.module';
@NgModule({
imports: [
@@ -26,7 +27,8 @@ import { LettersAvatarModule } from "ngx-letters-avatar";
GroupMessagesPageRoutingModule,
ChatPopoverPageModule,
BtnModalDismissPageModule,
- LettersAvatarModule
+ LettersAvatarModule,
+ PipesModule,
/* ImageCropperModule,
AngularCropperjsModule */
diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html
index 2796ce272..97c525f3d 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.html
+++ b/src/app/pages/chat/group-messages/group-messages.page.html
@@ -63,7 +63,8 @@
{{msg.duration}}
+