Merge branch 'developer' of bitbucket.org:equilibriumito/gabinete-digital into developer

src/app/models/beast-orm.ts

@@ -10,28 +10,26 @@ export class MessageModel extends models.Model {
 	mentions =  ArrayField()
 	msg =  models.CharField()
 	rid =  models.CharField()
-	ts =  models.CharField({blank:true})
+	ts =  JsonField({blank:true})
 	u =  JsonField()
-	_id =  models.CharField()
-	_updatedAt =  models.CharField()
+	_id =  models.CharField({blank:true})
+	_updatedAt =  models.IntegerField()
 	messageSend =  models.BooleanField()
 	offline =  models.BooleanField()
 	viewed =  ArrayField({blank:true})
 	received =  ArrayField({blank:true})
 	localReference =  models.CharField({blank:true})
 	attachments =  ArrayField({blank:true})
-	file =  ArrayField({blank:true})
+	file =  JsonField({blank:true})
 
 }
 
 export class DeleteMessageModel extends models.Model {
 
-	messageId = models.IntegerField()
+	messageId = models.CharField()
 	rid =  models.CharField()
-	ts =  models.CharField()
 	u =  JsonField()
 	needToReceiveBy = ArrayField()
-
 }
 
 
@@ -39,6 +37,9 @@ export class DeleteMessageModel extends models.Model {
 models.register({
   databaseName: 'chat-storage',
   type: 'indexedDB',
-  version: 1,
+  version: 4,
   models: [MessageModel, DeleteMessageModel]
 })
+
+
+window['MessageModel'] = MessageModel

src/app/models/permissionList.ts

@@ -0,0 +1,6 @@
+export class PermissionList{
+  Agenda = 530;
+  Gabinete = 531;
+  Actions = 534;
+  Chat = 541;
+}

src/app/models/user.model.ts

@@ -2,12 +2,12 @@ export class UserForm {
   username: string;
   password: string;
   domainName: string;
-  BasicAuthKey: string; 
+  BasicAuthKey: string;
 }
 
 
 export class LoginUserRespose {
-  BasicAuthKey: string; 
+  BasicAuthKey: string;
   UserId: number;
   Authorization: string;
   Email: string
@@ -30,11 +30,12 @@ export class LoginUserRespose {
   }[]
   UserName: string
   Profile: any;
+  UserPermissions: any;
 }
 
 
 export class UserSession {
-  BasicAuthKey: string; 
+  BasicAuthKey: string;
   UserId: number;
   Authorization: string;
   Email: string
@@ -63,5 +64,6 @@ export class UserSession {
   LoginPreference: 'None' | 'Password' | 'Pin' | null;
   PIN: string
   Inactivity: boolean
-  UrlBeforeInactivity: string
-}
+  UrlBeforeInactivity: string;
+  UserPermissions: any;
+}