From 5866bfe9dc6f13d1e7aa2682fd908d2aee919c2e Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 20 Aug 2021 18:46:52 +0100 Subject: [PATCH 1/6] Fix --- src/app/pages/events/events.page.html | 2 +- .../popover/opts-expediente-pr/opts-expediente-pr.page.ts | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) 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/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, From 50cf97e677e8078cae55d82ea8e508f8305f1ec6 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 20 Aug 2021 19:10:13 +0100 Subject: [PATCH 2/6] save --- src/app/pages/chat/chat.page.ts | 63 +++++++++++++++++++++++++-------- 1 file changed, 49 insertions(+), 14 deletions(-) diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index 16c295461..d83e749cd 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"){ + await new Promise(resolve => setTimeout(resolve, 5000)); + await this.getDirectMessages(); + console.log('Timer contactos list running') + } + } + } + else{ + await this.getDirectMessages(); + } }); } @@ -418,9 +432,13 @@ hideRefreshButton(){ console.log(this.dmUsers); }); } - getGroups(){ + + async getGroups(){ this.showLoader = true; - this.result = this.chatService.getAllPrivateGroups().subscribe((res:any)=>{ + 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; */ @@ -433,6 +451,23 @@ hideRefreshButton(){ 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"){ + await new Promise(resolve => setTimeout(resolve, 5000)); + await this.getGroups(); + console.log('Timer groups list running') + } + } + + } + else{ + await this.getGroups(); + } + }); } From d425e13b5ba18f458c27d446782a8b7073efb39a Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 20 Aug 2021 19:11:58 +0100 Subject: [PATCH 3/6] save --- src/app/pages/chat/chat.page.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index d83e749cd..4e266526d 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -434,7 +434,6 @@ hideRefreshButton(){ } async getGroups(){ - this.showLoader = true; this.result = this.chatService.getAllPrivateGroups().subscribe(async (res:any)=>{ if(res.groups != 200){ @@ -449,7 +448,6 @@ hideRefreshButton(){ return dateB - dateA; }); console.log(this.allGroups); - this.showLoader = false; /* }); */ if(this.route.url != "/home/chat"){ console.log("Timer message stop") From e74b56cd57d5a10ca2fd7d6aff52c82ee528f085 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 20 Aug 2021 19:13:58 +0100 Subject: [PATCH 4/6] Fix --- .../new-publication/new-publication.page.ts | 2 +- .../pages/publications/publications.page.html | 2 +- src/app/pages/search/search.page.ts | 30 ------------------- 3 files changed, 2 insertions(+), 32 deletions(-) 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(); - // } - } From 3d0c8a4e22ab77710eeaafc9fbde0bb1589c90d7 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 20 Aug 2021 19:20:48 +0100 Subject: [PATCH 5/6] save --- src/app/pages/chat/chat.page.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index 4e266526d..28e62adae 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -208,6 +208,7 @@ hideRefreshButton(){ } openMessagesPage(rid) { if( window.innerWidth < 701){ + this.segment = ''; this.openMessagesModal(rid); //this.router.navigate(['/home/chat/messages',rid,]); } @@ -257,6 +258,7 @@ hideRefreshButton(){ console.log(rid); if( window.innerWidth < 701){ + this.segment = ''; this.openGroupMessagesModal(rid); } else{ @@ -373,7 +375,7 @@ hideRefreshButton(){ } else { //Check if modal is opened - if(this.segment == "Contactos"){ + if(this.segment == "Contactos" && this.showMessages != true){ await new Promise(resolve => setTimeout(resolve, 5000)); await this.getDirectMessages(); console.log('Timer contactos list running') @@ -454,7 +456,7 @@ hideRefreshButton(){ } else { //Check if modal is opened - if(this.segment == "Grupos"){ + if(this.segment == "Grupos" && this.showGroupMessages != true){ await new Promise(resolve => setTimeout(resolve, 5000)); await this.getGroups(); console.log('Timer groups list running') From ce4198e99eb6626ab6448097de4496c06c5bd0b2 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 20 Aug 2021 19:22:33 +0100 Subject: [PATCH 6/6] save --- src/app/pages/chat/chat.page.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index 28e62adae..6efe623ee 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -208,7 +208,6 @@ hideRefreshButton(){ } openMessagesPage(rid) { if( window.innerWidth < 701){ - this.segment = ''; this.openMessagesModal(rid); //this.router.navigate(['/home/chat/messages',rid,]); } @@ -258,7 +257,6 @@ hideRefreshButton(){ console.log(rid); if( window.innerWidth < 701){ - this.segment = ''; this.openGroupMessagesModal(rid); } else{