diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index 16c295461..6efe623ee 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -115,7 +115,7 @@ export class ChatPage implements OnInit { private authService: AuthService, private storage:Storage, private resolver: ComponentFactoryResolver, - private router: Router, + private route: Router, ){ this.loggedUserChat = authService.ValidatedUserChat['data']; this.headers = new HttpHeaders(); @@ -355,20 +355,34 @@ hideRefreshButton(){ }); } - getDirectMessages(){ - this.showLoader = true; + async getDirectMessages(){ - this.chatService.getAllDirectMessages().subscribe((res:any)=>{ - console.log(res.ims); + this.chatService.getAllDirectMessages().subscribe(async (res:any)=>{ - this.userDirectMessages = res.ims.sort((a,b)=>{ - var dateA = new Date(a._updatedAt).getTime(); - var dateB = new Date(b._updatedAt).getTime(); - return dateB - dateA; - }); - console.log(this.userDirectMessages); - this.showLoader = false; + if(res.ims != 200){ + console.log(res.ims); + this.userDirectMessages = res.ims.sort((a,b)=>{ + var dateA = new Date(a._updatedAt).getTime(); + var dateB = new Date(b._updatedAt).getTime(); + return dateB - dateA; + }); + console.log(this.userDirectMessages); + if(this.route.url != "/home/chat"){ + console.log("Timer message stop") + } + else { + //Check if modal is opened + if(this.segment == "Contactos" && this.showMessages != true){ + await new Promise(resolve => setTimeout(resolve, 5000)); + await this.getDirectMessages(); + console.log('Timer contactos list running') + } + } + } + else{ + await this.getDirectMessages(); + } }); } @@ -418,9 +432,12 @@ hideRefreshButton(){ console.log(this.dmUsers); }); } - getGroups(){ - this.showLoader = true; - this.result = this.chatService.getAllPrivateGroups().subscribe((res:any)=>{ + + async getGroups(){ + this.result = this.chatService.getAllPrivateGroups().subscribe(async (res:any)=>{ + + if(res.groups != 200){ + this.privateGroups = res.groups; /* this.result = this.chatService.getAllUserChannels().subscribe((res:any)=>{ this.publicGroups = res.channels; */ @@ -431,8 +448,24 @@ hideRefreshButton(){ return dateB - dateA; }); console.log(this.allGroups); - this.showLoader = false; /* }); */ + if(this.route.url != "/home/chat"){ + console.log("Timer message stop") + } + else { + //Check if modal is opened + if(this.segment == "Grupos" && this.showGroupMessages != true){ + await new Promise(resolve => setTimeout(resolve, 5000)); + await this.getGroups(); + console.log('Timer groups list running') + } + } + + } + else{ + await this.getGroups(); + } + }); } diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index acad96b6e..7e067c269 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -98,7 +98,7 @@ (click)="goToExpediente(task.serialNumber)">
-
{{task.taskStartDate | date: 'dd-MM-yyyy HH:mm'}}
+
{{task.taskStartDate | date: 'dd-MM-yyyy'}}
{{task.taskStartDate | date: 'HH:mm'}}
diff --git a/src/app/pages/publications/new-publication/new-publication.page.ts b/src/app/pages/publications/new-publication/new-publication.page.ts index 6ecaa3d5d..e80885009 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.ts +++ b/src/app/pages/publications/new-publication/new-publication.page.ts @@ -81,7 +81,7 @@ export class NewPublicationPage implements OnInit { takePicture() { const options: CameraOptions = { - quality: 90, + quality: 50, destinationType: this.camera.DestinationType.DATA_URL, encodingType: this.camera.EncodingType.JPEG, mediaType: this.camera.MediaType.PICTURE, diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html index f2b4a694e..25305ce60 100644 --- a/src/app/pages/publications/publications.page.html +++ b/src/app/pages/publications/publications.page.html @@ -39,7 +39,7 @@
- diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index 997d4b359..2f085ee99 100644 --- a/src/app/pages/search/search.page.ts +++ b/src/app/pages/search/search.page.ts @@ -622,34 +622,4 @@ export class SearchPage implements OnInit { } - // async openExpedientActionsModal(doc: SearchDocument) { - - // let customTask: task = { - // serialNumber: doc.SourceId, - // taskStartDate: doc.CreateDate, - // isEvent: true, - // workflowInstanceDataFields: { - // FolderID: , - // Subject: , - // SourceSecFsID: , - // SourceType: , - // SourceID: , - // FolderID: null, - // DocId: doc.SourceId, - // Subject: doc.SourceName, - // }, - // } - - // const popover = await this.modalController.create({ - // component: OptsExpedientePage, - // cssClass: 'model aside-modal search-submodal', - // componentProps: { - // fulltask: customTask, - // task: customTask - // }, - // //translucent: true - // }); - // return await popover.present(); - // } - } diff --git a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts index 4f12896ff..340ad0960 100644 --- a/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts +++ b/src/app/shared/popover/opts-expediente-pr/opts-expediente-pr.page.ts @@ -44,11 +44,9 @@ export class OptsExpedientePrPage implements OnInit { private modalController: ModalController, private processes: ProcessesService, private attachmentsService: AttachmentsService, - private activatedRoute: ActivatedRoute, private userAuth: AuthService, private navParams: NavParams, private animationController: AnimationController, - private router: Router, private toastService: ToastService, private location: Location,