diff --git a/src/app/modals/add-note/add-note.page.html b/src/app/modals/add-note/add-note.page.html index eba4947eb..d40eba2a3 100644 --- a/src/app/modals/add-note/add-note.page.html +++ b/src/app/modals/add-note/add-note.page.html @@ -49,6 +49,7 @@
+ - + diff --git a/src/app/modals/profile/profile.page.ts b/src/app/modals/profile/profile.page.ts index 4afecfd00..70b095849 100644 --- a/src/app/modals/profile/profile.page.ts +++ b/src/app/modals/profile/profile.page.ts @@ -65,7 +65,7 @@ export class ProfilePage implements OnInit { this.eventTriger.getObservable().subscribe((event) => { if (event.notification == "recive") { this.getNotificationData(); - } else if(event.notification == "deleted") { + } else if (event.notification == "deleted") { console.log('header', event.notification) this.getNotificationData(); } @@ -104,7 +104,7 @@ export class ProfilePage implements OnInit { this.DataArray = [] value.forEach((element, i) => { - console.log('Getnotifications',element, i ) + console.log('Getnotifications', element, i) let notificationObject; if (element.notification) { @@ -185,30 +185,38 @@ export class ProfilePage implements OnInit { return time; } - notificatinsRoutes = (index, Service, Object, IdObject, FolderId,i) => { + notificatinsRoutes = (index, Service, Object, IdObject, FolderId, i) => { console.log(index, i) - if(Service === "agenda") { + if (Service === "agenda") { this.isloading = true - this.eventsService.getEvent(IdObject).subscribe((task) => { + if (Service === "agenda" && IdObject.length > 10) { + this.eventsService.getEvent(IdObject).subscribe((task) => { - if (Service === "agenda" && IdObject.length > 10) { this.zone.run(() => this.router.navigate(['/home/agenda', IdObject, 'agenda'])); - - } else if (Service === "agenda" && Object === "event-list") { - //this.zone.run(() => this.router.navigate(['/home/gabinete-digital/event-list/approve-event',IdObject, 'agenda'])); + this.deleteNotification(index); + this.isloading = false + + }, (error) => { + this.notificationdata[i].read = true; + this.isloading = false + }) + } + + if (Service === "agenda" && Object === "event-list") { + this.isloading = true + this.processesService.GetTask(IdObject).subscribe((task) => { this.zone.run(() => this.router.navigate(['/home/agenda/event-list/approve-event', IdObject, 'agenda'])); - - } + this.deleteNotification(index); + this.isloading = false - this.deleteNotification(index); - this.isloading = false + }, (error) => { + this.notificationdata[i].read = true; + this.isloading = false + }) - }, (error) => { - this.notificationdata[i].read = true; - this.isloading = false - }) + } } else if (Service === "gabinete-digital") { this.isloading = true @@ -218,29 +226,29 @@ export class ProfilePage implements OnInit { this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expediente', IdObject, 'gabinete-digital'])); } else if (Service === "gabinete-digital" && Object === "despachos") { this.zone.run(() => this.router.navigate(['/home/gabinete-digital/despachos', IdObject, 'gabinete-digital'], { replaceUrl: true })); - }else if (Service === "gabinete-digital" && Object === "parecer") { + } else if (Service === "gabinete-digital" && Object === "parecer") { this.zone.run(() => this.router.navigate(['/home/gabinete-digital/pedidos', IdObject, 'gabinete-digital'])); } else if (Service === "gabinete-digital" && Object === "deferimento") { - + this.zone.run(() => this.router.navigate(['/home/gabinete-digital/pedidos', IdObject, 'gabinete-digital'])); } else if (Service === "gabinete-digital" && Object === "despachos-pr") { - + this.zone.run(() => this.router.navigate(['/home/gabinete-digital/despachos-pr', IdObject, 'gabinete-digital'])); } this.deleteNotification(index); this.isloading = false - + }, (error) => { this.notificationdata[i].read = true; this.isloading = false }) - } else if( Service === "accoes") { + } else if (Service === "accoes") { if (Service === "accoes" && Object === "accao") { this.zone.run(() => this.router.navigate(['/home/publications', IdObject])); this.deleteNotification(index); @@ -257,63 +265,63 @@ export class ProfilePage implements OnInit { } - /* if (Service === "agenda" && IdObject.length > 10) { - this.zone.run(() => this.router.navigate(['/home/agenda', IdObject, 'agenda'])); - } - else if (Service === "gabinete-digital" && Object === "expedientes") { - this.processesService.GetTask(IdObject).subscribe((task) => { - this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expediente', IdObject, 'gabinete-digital'])); - }, (error) => { - this.notificationdata[i].read = true; - }) - } - else if (Service === "agenda" && Object === "event-list") { - //this.zone.run(() => this.router.navigate(['/home/gabinete-digital/event-list/approve-event',IdObject, 'agenda'])); - this.zone.run(() => this.router.navigate(['/home/agenda/event-list/approve-event', IdObject, 'agenda'])); - - } else if (Service === "gabinete-digital" && Object === "despachos") { - this.processesService.GetTask(IdObject).subscribe((task) => { - this.zone.run(() => this.router.navigate(['/home/gabinete-digital/despachos', IdObject, 'gabinete-digital'], { replaceUrl: true })); - }, (error) => { - this.notificationdata[i].read = true; - }) - - - } - else if (Service === "gabinete-digital" && Object === "parecer") { - - this.zone.run(() => this.router.navigate(['/home/gabinete-digital/pedidos', IdObject, 'gabinete-digital'])); - } - else if (Service === "gabinete-digital" && Object === "deferimento") { - - this.zone.run(() => this.router.navigate(['/home/gabinete-digital/pedidos', IdObject, 'gabinete-digital'])); - } - else if (Service === "gabinete-digital" && Object === "despachos-pr") { - - this.zone.run(() => this.router.navigate(['/home/gabinete-digital/despachos-pr', IdObject, 'gabinete-digital'])); - } - else if (Service === "accoes" && Object === "accao") { - this.zone.run(() => this.router.navigate(['/home/publications', IdObject])); - } - else if (Service === "accoes" && Object === "publicacao") { - this.zone.run(() => this.router.navigate(['/home/publications/view-publications', FolderId, IdObject])); - } - else if (Service === "gabinete-digital" && Object === "diplomas") { - this.zone.run(() => this.router.navigate(['/home/gabinete-digital/diplomas', IdObject, 'gabinete-digital'])); - } - else if (Service === "gabinete-digital" && Object === "diplomas-assinar") { - - this.zone.run(() => this.router.navigate(['/home/gabinete-digital/diplomas-assinar', IdObject, 'gabinete-digital'])); - } - else if (Service === "gabinete-digital" && Object === "expedientes-pr") { - this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expedientes-pr', IdObject, 'gabinete-digital'])); - } else if (Service === "chat") { - let navigationExtras: NavigationExtras = { queryParams: { "roomId": IdObject, } }; - this.zone.run(() => this.router.navigate(['/home/chat'], navigationExtras)); - } */ + /* if (Service === "agenda" && IdObject.length > 10) { + this.zone.run(() => this.router.navigate(['/home/agenda', IdObject, 'agenda'])); + } + else if (Service === "gabinete-digital" && Object === "expedientes") { + this.processesService.GetTask(IdObject).subscribe((task) => { + this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expediente', IdObject, 'gabinete-digital'])); + }, (error) => { + this.notificationdata[i].read = true; + }) + } + else if (Service === "agenda" && Object === "event-list") { + //this.zone.run(() => this.router.navigate(['/home/gabinete-digital/event-list/approve-event',IdObject, 'agenda'])); + this.zone.run(() => this.router.navigate(['/home/agenda/event-list/approve-event', IdObject, 'agenda'])); + + } else if (Service === "gabinete-digital" && Object === "despachos") { + this.processesService.GetTask(IdObject).subscribe((task) => { + this.zone.run(() => this.router.navigate(['/home/gabinete-digital/despachos', IdObject, 'gabinete-digital'], { replaceUrl: true })); + }, (error) => { + this.notificationdata[i].read = true; + }) + + + } + else if (Service === "gabinete-digital" && Object === "parecer") { + + this.zone.run(() => this.router.navigate(['/home/gabinete-digital/pedidos', IdObject, 'gabinete-digital'])); + } + else if (Service === "gabinete-digital" && Object === "deferimento") { + + this.zone.run(() => this.router.navigate(['/home/gabinete-digital/pedidos', IdObject, 'gabinete-digital'])); + } + else if (Service === "gabinete-digital" && Object === "despachos-pr") { + + this.zone.run(() => this.router.navigate(['/home/gabinete-digital/despachos-pr', IdObject, 'gabinete-digital'])); + } + else if (Service === "accoes" && Object === "accao") { + this.zone.run(() => this.router.navigate(['/home/publications', IdObject])); + } + else if (Service === "accoes" && Object === "publicacao") { + this.zone.run(() => this.router.navigate(['/home/publications/view-publications', FolderId, IdObject])); + } + else if (Service === "gabinete-digital" && Object === "diplomas") { + this.zone.run(() => this.router.navigate(['/home/gabinete-digital/diplomas', IdObject, 'gabinete-digital'])); + } + else if (Service === "gabinete-digital" && Object === "diplomas-assinar") { + + this.zone.run(() => this.router.navigate(['/home/gabinete-digital/diplomas-assinar', IdObject, 'gabinete-digital'])); + } + else if (Service === "gabinete-digital" && Object === "expedientes-pr") { + this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expedientes-pr', IdObject, 'gabinete-digital'])); + } else if (Service === "chat") { + let navigationExtras: NavigationExtras = { queryParams: { "roomId": IdObject, } }; + this.zone.run(() => this.router.navigate(['/home/chat'], navigationExtras)); + } */ // this.notificationservice.tempClearArray(); - + diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index 0d13afc8c..9903032c1 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -844,10 +844,7 @@ export class AgendaPage implements OnInit { const selectedCalendarIds = this.getSelectedAgendaCalendars(); this.listToPresent = this.CalendarStore.getEventsByCalendarIds(selectedCalendarIds) - const listToPresent = this.listToPresent.filter( e => momentG(new Date(this.eventSelectedDate), 'dd MMMM yyyy', 'pt') == momentG(e.startTime, 'dd MMMM yyyy', 'pt')) - - - this.TimelineMDList = this.listBoxService.list(listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate }) + this.TimelineMDList = this.listBoxService.list(this.listToPresent, 'md', this.rangeStartDate, this.rangeEndDate, { segment: this.segment, selectedDate: this.eventSelectedDate }) const selectedDay = momentG(this.eventSelectedDate, 'dd', 'pt'); if(this.TimelineMDList[selectedDay]) { diff --git a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html index 45b2646fd..150600c25 100644 --- a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html +++ b/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html @@ -9,7 +9,7 @@
- +
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 edbbc4a99..e0ffe37a5 100644 --- a/src/app/pages/publications/new-publication/new-publication.page.ts +++ b/src/app/pages/publications/new-publication/new-publication.page.ts @@ -211,6 +211,7 @@ export class NewPublicationPage implements OnInit { if (this.publicationType == '3') { + // has captured image if (this.capturedImage != '') { this.publication = { DateIndex: this.publication.DateIndex, @@ -232,7 +233,7 @@ export class NewPublicationPage implements OnInit { this.httpErrorHandle.httpsSucessMessagge('Publicação Editada') console.log({response}) - this.RouteService.goBack() + this.close() } catch (error) { this.httpErrorHandle.httpStatusHandle(error) } finally { @@ -240,8 +241,8 @@ export class NewPublicationPage implements OnInit { } } - else if (!this.publication.OriginalFileName) { - + // no file names + else if (!this.PublicationFolderService.PublicationHasImage(this.publication)) { this.publication = { DateIndex: this.publication.DateIndex, DocumentId: this.publication.DocumentId, @@ -249,9 +250,9 @@ export class NewPublicationPage implements OnInit { Title: this.pub.Title, Message: this.pub.Message, DatePublication: this.publication.DatePublication, - // OriginalFileName: this.publication.OriginalFileName, - // FileBase64: this.publication.FileBase64, - // FileExtension: 'jpeg', + OriginalFileName: "", + FileBase64: "", + FileExtension: "", } const loader = this.toastService.loading() @@ -261,7 +262,7 @@ export class NewPublicationPage implements OnInit { this.httpErrorHandle.httpsSucessMessagge('Criar publicação') console.log({response}) - this.RouteService.goBack() + this.close() } catch (error) { this.httpErrorHandle.httpStatusHandle(error) } finally { @@ -276,8 +277,8 @@ export class NewPublicationPage implements OnInit { Title: this.pub.Title, Message: this.pub.Message, DatePublication: this.publication.DatePublication, - OriginalFileName: this.capturedImageTitle, - FileBase64: this.capturedImage, + OriginalFileName: this.publication.OriginalFileName, + FileBase64: this.publication.FileBase64, FileExtension: 'jpeg', } @@ -287,7 +288,7 @@ export class NewPublicationPage implements OnInit { const response = await this.publications.UpdatePublication(this.publication.ProcessId, this.publication).toPromise() this.httpErrorHandle.httpsSucessMessagge('Publicação Editada') console.log({response}) - this.RouteService.goBack() + this.close() } catch (error) { this.httpErrorHandle.httpStatusHandle(error) } finally { @@ -345,8 +346,8 @@ export class NewPublicationPage implements OnInit { } clear() { - this.capturedImageTitle = ''; - this.capturedImage = ''; + this.capturedImageTitle = null; + this.capturedImage = null; } setTitle() { diff --git a/src/app/pipes/publication.pipe.ts b/src/app/pipes/publication.pipe.ts index 6a52ba4cb..e74636fc3 100644 --- a/src/app/pipes/publication.pipe.ts +++ b/src/app/pipes/publication.pipe.ts @@ -20,8 +20,8 @@ export class PublicationPipe implements PipeTransform { "DatePublication": element.DatePublication, /* image:itemImage, */ "FileBase64": "data:image/jpg;base64," + element.FileBase64, - "OriginalFileName": '', - "FileExtension": '', + "OriginalFileName": element?.OriginalFileName, + "FileExtension": element?.FileExtension, "OrganicEntityId": element.OrganicEntityId } } diff --git a/src/app/shared/publication/new-publication/new-publication.page.ts b/src/app/shared/publication/new-publication/new-publication.page.ts index 4e1a59bee..16ace1644 100644 --- a/src/app/shared/publication/new-publication/new-publication.page.ts +++ b/src/app/shared/publication/new-publication/new-publication.page.ts @@ -102,6 +102,9 @@ export class NewPublicationPage implements OnInit { } this.pub = this.publication; this.showLoader = false; + }, () => { + this.showLoader = false; + this.goBack() }); } @@ -174,7 +177,7 @@ export class NewPublicationPage implements OnInit { Title: this.pub.Title, Message: this.pub.Message, DatePublication: this.publication.DatePublication, - OriginalFileName: this.capturedImageTitle, + OriginalFileName: this.publication.OriginalFileName || 'foto', FileBase64: this.capturedImage, FileExtension: 'jpeg', } @@ -196,7 +199,8 @@ export class NewPublicationPage implements OnInit { } } - else if (!this.publication.OriginalFileName) { // + else if (!this.PublicationFolderService.PublicationHasImage(this.publication)) { // + this.publication = { DateIndex: this.publication.DateIndex, DocumentId:this.publication.DocumentId, @@ -204,10 +208,9 @@ export class NewPublicationPage implements OnInit { Title: this.pub.Title, Message: this.pub.Message, DatePublication: this.publication.DatePublication, - OriginalFileName: this.capturedImageTitle, - // OriginalFileName: this.publication.OriginalFileName, - // FileBase64: this.publication.FileBase64, - // FileExtension: 'jpeg', + OriginalFileName: this.publication.OriginalFileName, + FileBase64: "", + FileExtension: this.publication.FileExtension, } const loader = this.toastService.loading() @@ -233,7 +236,7 @@ export class NewPublicationPage implements OnInit { Title: this.pub.Title, Message: this.pub.Message, DatePublication: this.publication.DatePublication, - OriginalFileName: this.capturedImageTitle, + OriginalFileName: this.publication.OriginalFileName, FileBase64: this.capturedImage, FileExtension: 'jpeg', } diff --git a/src/app/store/publication-folder.service.ts b/src/app/store/publication-folder.service.ts index a54700c33..9cbdac7f3 100644 --- a/src/app/store/publication-folder.service.ts +++ b/src/app/store/publication-folder.service.ts @@ -196,6 +196,15 @@ export class PublicationFolderService { } + + PublicationHasImage(Publication: Publication) { + return Publication.FileBase64 != '' && Publication.FileBase64 != "data:image/jpg;base64,null" + } + + hasCapturedImage(Publication: Publication) { + return Publication.FileBase64 != '' && Publication.FileBase64 != "data:image/jpg;base64,null" + } + } diff --git a/version/git-version.ts b/version/git-version.ts index 5997fbeaf..70ff8dda2 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "926e4e39d", - "SHA": "926e4e39d8b0c3d3d073e6d98e5f2f049e12f9c2", + "shortSHA": "578797e01", + "SHA": "578797e0197b3d219921fc73a25f6184c6b67395", "branch": "developer-prod", "lastCommitAuthor": "'Eudes Inácio'", - "lastCommitTime": "'Tue Aug 22 14:13:41 2023 +0100'", - "lastCommitMessage": "pull made", - "lastCommitNumber": "5204", + "lastCommitTime": "'Tue Aug 22 15:47:47 2023 +0100'", + "lastCommitMessage": "pul made", + "lastCommitNumber": "5206", "change": "", - "changeStatus": "On branch developer-prod\nYour branch and 'origin/developer-prod' have diverged,\nand have 3 and 2 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/home/home.page.ts\n\tmodified: src/app/pages/events/events.page.ts", + "changeStatus": "On branch developer-prod\nYour branch and 'origin/developer-prod' have diverged,\nand have 4 and 1 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/modals/add-note/add-note.page.html\n\tmodified: src/app/modals/profile/profile.page.ts\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.ts\n\tmodified: src/app/pipes/publication.pipe.ts\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.ts\n\tmodified: src/app/store/publication-folder.service.ts", "changeAuthor": "eudes.inacio" } \ No newline at end of file