From 64569c18bb04376b4e08e1131e02a84f585096cb Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 15 Jul 2021 16:18:57 +0100 Subject: [PATCH 1/8] Add background --- .../publications/new-publication/new-publication.page.ts | 5 ++--- .../view-publications/view-publications.page.html | 4 ++-- 2 files changed, 4 insertions(+), 5 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 b23d7951f..f219f7d96 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.ts +++ b/src/app/pages/publications/new-publication/new-publication.page.ts @@ -218,14 +218,13 @@ export class NewPublicationPage implements OnInit { } else { - this.publication = { - DateIndex: new Date(), + DateIndex: new Date().toLocaleString('pt'), DocumentId:null, ProcessId:this.folderId, Title: this.pub.Title, Message: this.pub.Message, - DatePublication: new Date(), + DatePublication: new Date().toLocaleString('pt'), OriginalFileName: this.capturedImageTitle, FileBase64: this.capturedImage, FileExtension: 'jpeg', 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 77480b5d8..d78e17542 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.html +++ b/src/app/pages/publications/view-publications/view-publications.page.html @@ -24,13 +24,13 @@ - + -
+
Date: Thu, 15 Jul 2021 17:01:32 +0100 Subject: [PATCH 2/8] Improve Actions --- .../new-publication/new-publication.page.ts | 8 +- .../publication-detail.page.ts | 1 + src/plugin/momentG.js | 73 ++++++++++++++++++- 3 files changed, 78 insertions(+), 4 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 f219f7d96..ad25f1dfc 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.ts +++ b/src/app/pages/publications/new-publication/new-publication.page.ts @@ -14,6 +14,7 @@ import { Camera, CameraOptions } from '@ionic-native/camera/ngx'; import { ToastService } from 'src/app/services/toast.service'; import { FormControl, FormGroup, Validators } from '@angular/forms'; import { ThemePalette } from '@angular/material/core'; +import { formatDate } from 'src/plugin/momentG.js' @Component({ selector: 'app-new-publication', @@ -218,13 +219,16 @@ export class NewPublicationPage implements OnInit { } else { + const date = formatDate(new Date(), 'yyyy-MM-dd HH:mm:ss') + alert(date) + this.publication = { - DateIndex: new Date().toLocaleString('pt'), + DateIndex: date, DocumentId:null, ProcessId:this.folderId, Title: this.pub.Title, Message: this.pub.Message, - DatePublication: new Date().toLocaleString('pt'), + DatePublication: date, OriginalFileName: this.capturedImageTitle, FileBase64: this.capturedImage, FileExtension: 'jpeg', 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 8eb0251e8..0066df0bc 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 @@ -119,6 +119,7 @@ export class PublicationDetailPage implements OnInit { componentProps:{ publicationType: publicationType, publication: this.publication, + folderId: this.folderId }, cssClass: 'new-publication modal modal-desktop', backdropDismiss: false diff --git a/src/plugin/momentG.js b/src/plugin/momentG.js index cf1d662b1..dedd24f3a 100644 --- a/src/plugin/momentG.js +++ b/src/plugin/momentG.js @@ -60,5 +60,74 @@ class momentG { } module.exports = { - momentG: momentG.run -}; \ No newline at end of file + momentG: momentG.run, + formatDate: formatDate +}; + + + +var monthNames = [ + "January", "February", "March", "April", "May", "June", "July", + "August", "September", "October", "November", "December" +]; +var dayOfWeekNames = [ + "Sunday", "Monday", "Tuesday", + "Wednesday", "Thursday", "Friday", "Saturday" +]; + +function formatDate(date, patternStr){ + if (!patternStr) { + patternStr = 'M/d/yyyy'; + } + var day = date.getDate(), + month = date.getMonth(), + year = date.getFullYear(), + hour = date.getHours(), + minute = date.getMinutes(), + second = date.getSeconds(), + miliseconds = date.getMilliseconds(), + h = hour % 12, + hh = twoDigitPad(h), + HH = twoDigitPad(hour), + mm = twoDigitPad(minute), + ss = twoDigitPad(second), + aaa = hour < 12 ? 'AM' : 'PM', + EEEE = dayOfWeekNames[date.getDay()], + EEE = EEEE.substr(0, 3), + dd = twoDigitPad(day), + M = month + 1, + MM = twoDigitPad(M), + MMMM = monthNames[month], + MMM = MMMM.substr(0, 3), + yyyy = year + "", + yy = yyyy.substr(2, 2) + ; + // checks to see if month name will be used + patternStr = patternStr + .replace('hh', hh).replace('h', h) + .replace('HH', HH).replace('H', hour) + .replace('mm', mm).replace('m', minute) + .replace('ss', ss).replace('s', second) + .replace('S', miliseconds) + .replace('dd', dd).replace('d', day) + + .replace('EEEE', EEEE).replace('EEE', EEE) + .replace('yyyy', yyyy) + .replace('yy', yy) + .replace('aaa', aaa); + if (patternStr.indexOf('MMM') > -1) { + patternStr = patternStr + .replace('MMMM', MMMM) + .replace('MMM', MMM); + } + else { + patternStr = patternStr + .replace('MM', MM) + .replace('M', M); + } + return patternStr; +} + +function twoDigitPad(num) { + return num < 10 ? "0" + num : num; +} \ No newline at end of file From c315873b2d1faf682828d61fe3989c33d39105be Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 15 Jul 2021 17:15:04 +0100 Subject: [PATCH 3/8] Improve --- .../view-publications/view-publications.page.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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 bc9d44fcf..47fa0f595 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.ts +++ b/src/app/pages/publications/view-publications/view-publications.page.ts @@ -36,12 +36,17 @@ export class ViewPublicationsPage implements OnInit { this.folderId = params["params"].folderId; console.log(params["params"]); } + }); + } ngOnInit() { - console.log(this.folderId); - + + if(typeof(this.folderId) == 'object') { + this.folderId = this.folderId['ProcessId'] + } + this.getPublications(); this.getPublicationDetail(); } From 3da699e4501eb6e1fb825eab23851fc38d57e92a Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 15 Jul 2021 17:18:51 +0100 Subject: [PATCH 4/8] Improve --- .../publications/view-publications/view-publications.page.html | 1 - 1 file changed, 1 deletion(-) 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 d78e17542..b49b541c0 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.html +++ b/src/app/pages/publications/view-publications/view-publications.page.html @@ -1,6 +1,5 @@ - From 79634e0f3ae4d62a89f1334aa6f4acc29d5cc54b Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 15 Jul 2021 17:30:02 +0100 Subject: [PATCH 5/8] Add find or return --- src/app/pages/agenda/view-event/view-event.page.ts | 12 ++++++++---- src/app/shared/agenda/view-event/view-event.page.ts | 4 +++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/pages/agenda/view-event/view-event.page.ts index 406312249..4d7378c27 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/src/app/pages/agenda/view-event/view-event.page.ts @@ -109,16 +109,20 @@ export class ViewEventPage implements OnInit { }); } - loadEvent(){ + loadEvent() { const loader = this.toastService.loading(); this.eventsService.getEvent(this.eventId).subscribe(res => { this.loadedEvent = res; - - console.log(res); - /* this.today = new Date(res.StartDate); this.customDate = this.days[this.today.getDay()]+ ", " + this.today.getDate() +" de " + ( this.months[this.today.getMonth()]); */ loader.remove() + }, ()=>{ + + loader.remove() + this.toastService.badRequest('Este evento já não existe na sua agenda') + this.modalController.dismiss('Eevent not Foud'); + this.router.navigate(['/home/agenda']); + }); } diff --git a/src/app/shared/agenda/view-event/view-event.page.ts b/src/app/shared/agenda/view-event/view-event.page.ts index 93fbb2e29..4a5be4e7b 100644 --- a/src/app/shared/agenda/view-event/view-event.page.ts +++ b/src/app/shared/agenda/view-event/view-event.page.ts @@ -89,7 +89,7 @@ export class ViewEventPage implements OnInit { }) } - loadEvent(){ + loadEvent() { this.eventsService.getEvent(this.eventId).subscribe(res => { this.loadedEvent = res; this.today = new Date(res.StartDate); @@ -99,6 +99,8 @@ export class ViewEventPage implements OnInit { this.viewEventDetailDismiss.emit({ type: 'close' }) + + this.toastService.badRequest('Este evento já não existe na sua agenda') }) ; } From 7f0d7caadeaa27f96c7f641826648e959880e050 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 15 Jul 2021 17:39:19 +0100 Subject: [PATCH 6/8] Fixe --- .../publication/view-publications/view-publications.page.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/app/shared/publication/view-publications/view-publications.page.ts b/src/app/shared/publication/view-publications/view-publications.page.ts index 825343571..63b6b6651 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.ts +++ b/src/app/shared/publication/view-publications/view-publications.page.ts @@ -39,6 +39,10 @@ export class ViewPublicationsPage implements OnInit { ngOnInit() { console.log(this.folderId); + + if(typeof(this.folderId) == 'object') { + this.folderId = this.folderId['ProcessId'] + } this.getPublications(); this.getPublicationDetail(); From b691cb1a078a953c13463a74129bd547cf5d0144 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 15 Jul 2021 17:42:12 +0100 Subject: [PATCH 7/8] Improve --- .../view-publications/view-publications.page.ts | 11 +++++++++++ .../view-publications/view-publications.page.ts | 4 ++++ 2 files changed, 15 insertions(+) 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 47fa0f595..1f5df530a 100644 --- a/src/app/pages/publications/view-publications/view-publications.page.ts +++ b/src/app/pages/publications/view-publications/view-publications.page.ts @@ -51,6 +51,17 @@ export class ViewPublicationsPage implements OnInit { this.getPublicationDetail(); } + ngOnChanges() { + console.log(this.folderId) + + if(typeof(this.folderId) == 'object') { + this.folderId = this.folderId['ProcessId'] + } + + this.getPublications(); + this.getPublicationDetail(); + } + doRefresh(event) { this.getPublications(); diff --git a/src/app/shared/publication/view-publications/view-publications.page.ts b/src/app/shared/publication/view-publications/view-publications.page.ts index 63b6b6651..3cb0a5e9a 100644 --- a/src/app/shared/publication/view-publications/view-publications.page.ts +++ b/src/app/shared/publication/view-publications/view-publications.page.ts @@ -51,6 +51,10 @@ export class ViewPublicationsPage implements OnInit { ngOnChanges(changes: any): void { console.log(this.folderId) + if(typeof(this.folderId) == 'object') { + this.folderId = this.folderId['ProcessId'] + } + this.getPublications(); this.getPublicationDetail(); } From 62db07aa526fda975484e04efb36fe8bf12911f1 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 15 Jul 2021 17:45:00 +0100 Subject: [PATCH 8/8] Improve --- src/app/pages/publications/publications.page.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/pages/publications/publications.page.html b/src/app/pages/publications/publications.page.html index 2dc6c80a3..05567c79b 100644 --- a/src/app/pages/publications/publications.page.html +++ b/src/app/pages/publications/publications.page.html @@ -35,7 +35,7 @@
-