diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/pages/agenda/agenda.page.html index 43d891c63..9c1fa190e 100644 --- a/src/app/pages/agenda/agenda.page.html +++ b/src/app/pages/agenda/agenda.page.html @@ -102,7 +102,7 @@ -
+
MC
diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html index 38d2679d0..f6323e183 100644 --- a/src/app/pages/agenda/new-event/new-event.page.html +++ b/src/app/pages/agenda/new-event/new-event.page.html @@ -30,7 +30,7 @@
Agenda de {{calendars}}
-
Agenda de {{loggeduser.FullName}}
+
Agenda de {{loggeduser.FullName}}
diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts index a1bf277c6..5eaaa4bbc 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -103,15 +103,6 @@ export class NewEventPage implements OnInit { this.selectedDate = this.navParams.get('eventSelectedDate'); this.taskParticipants = this.navParams.get('attendees'); - - if(!this.CalendarName) { - if(this.eventService.calendarNamesAry.includes('Meu calendario')) { - this.CalendarName = 'Meu calendario'; - } else if(this.eventService.calendarNamesAry.length == 1 ) { - this.CalendarName = this.eventService.calendarNamesAry[0] - } - } - } ngOnInit() { @@ -119,6 +110,13 @@ export class NewEventPage implements OnInit { this.CalendarName = this.loggeduser.Profile; this.selectedRecurringType = "-1"; + if(!this.CalendarName) { + if(this.eventService.calendarNamesAry.includes('Meu calendario')) { + this.CalendarName = 'Meu calendario'; + } else { + this.CalendarName = this.eventService.calendarNamesAry[0] + } + } this.getRecurrenceTypes(); diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index 6bea28346..8d758e4dc 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -1,4 +1,4 @@ -import { HttpClient, HttpErrorResponse, HttpHeaders, HttpParams } from '@angular/common/http'; +import { HttpHeaders, HttpParams } from '@angular/common/http'; import { Component, OnInit, @@ -187,6 +187,8 @@ export class ChatPage implements OnInit { if (window.innerWidth < 701) { this.idSelected = ''; this.hideRefreshBtn = false; + this.closeAllDesktopComponents() + this.ChatSystemService.getRoomById(this.roomId).roomLeave() } else { this.hideRefreshBtn = true; @@ -352,8 +354,6 @@ export class ChatPage implements OnInit { async closeNewEventComponentAndOpenChat({roomId}) { this.closeAllDesktopComponents(); - console.log(roomId) - this.ChatSystemService._group.forEach((room)=>{ if(room.id == roomId) { diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html index 274e63b16..c94f357e7 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.html +++ b/src/app/pages/chat/group-messages/group-messages.page.html @@ -62,11 +62,12 @@ {{msg.msg}} - - - - - + Enviado + + + + + Lido
Tentar
{{last ? scrollToBottom() : ''}} @@ -102,10 +103,12 @@ image - - - - + Enviado + + + + + Lido
Tentar
@@ -155,11 +158,13 @@ - - - - - + + Enviado + + + + + Lido
Tentar
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html index 94b5ead33..77ddd1bc7 100644 --- a/src/app/pages/chat/messages/messages.page.html +++ b/src/app/pages/chat/messages/messages.page.html @@ -60,10 +60,12 @@ - - - - + Enviado + + + + + Lido
Tentar
@@ -97,10 +99,12 @@ image - - - - + Enviado + + + + + Lido
Tentar
@@ -161,11 +165,12 @@ - - - - - + Enviado + + + + + Lido
Tentar
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index 355a8c3f9..b4efdde6e 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -234,7 +234,7 @@ - +
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 71af3bee3..1a9cd14d9 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -570,7 +570,7 @@ export class GabineteDigitalPage implements OnInit { updateAllProcess() { this.AllProcess = this.expedientegbstore.list.concat(this.pedidosstore.listparecer).concat(this.pedidosstore.listdeferimento) .concat(this.despachoprstore.list).concat(this.eventoaprovacaostore.listmd).concat(this.eventoaprovacaostore.listpr).concat(this.despachoStore.list) - // .concat(this.deplomasStore.diplomasParaAssinarList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.deplomasStore.DiplomaGerarList) + .concat(this.deplomasStore.diplomasParaAssinarList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.deplomasStore.DiplomaGerarList) } get getAllProcessCount() { diff --git a/src/app/pages/publications/new-action/new-action.page.ts b/src/app/pages/publications/new-action/new-action.page.ts index a39ad6007..62b896088 100644 --- a/src/app/pages/publications/new-action/new-action.page.ts +++ b/src/app/pages/publications/new-action/new-action.page.ts @@ -112,7 +112,7 @@ export class NewActionPage implements OnInit { runValidation() { this.validateFrom = true; if(new Date(this.folder.DateBegin).toISOString() > new Date(this.folder.DateEnd).toISOString()){ - this.toastService.badRequest("A data de início não pode ser superior a data de fim"); + this.toastService._badRequest("A data de início não pode ser superior a data de fim"); } } diff --git a/src/app/services/chat/chat-system.service.ts b/src/app/services/chat/chat-system.service.ts index 07c820cfb..1769d7893 100644 --- a/src/app/services/chat/chat-system.service.ts +++ b/src/app/services/chat/chat-system.service.ts @@ -18,7 +18,6 @@ import { ChatMethodsService } from './chat-methods.service'; import { AESEncrypt } from '../aesencrypt.service' import { AttachmentsService } from 'src/app/services/attachments.service'; import { NetworkServiceService} from 'src/app/services/network-service.service'; -import { JsonStore } from '../jsonStore.service'; import { ViewedMessageService } from './viewed-message.service' @Injectable({ providedIn: 'root' diff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html index 34b8207b2..0be3e0bc3 100644 --- a/src/app/shared/agenda/new-event/new-event.page.html +++ b/src/app/shared/agenda/new-event/new-event.page.html @@ -41,7 +41,7 @@
Agenda de {{calendars}}
-
Agenda de {{loggeduser.FullName}}
+
Agenda de {{loggeduser.FullName}}
diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts index 5b5a67ed9..fbc5844a7 100644 --- a/src/app/shared/agenda/new-event/new-event.page.ts +++ b/src/app/shared/agenda/new-event/new-event.page.ts @@ -140,7 +140,7 @@ export class NewEventPage implements OnInit { if(!this.CalendarName) { if(this.eventService.calendarNamesAry.includes('Meu calendario')) { this.CalendarName = 'Meu calendario'; - } else if(this.eventService.calendarNamesAry.length == 1 ) { + } else { this.CalendarName = this.eventService.calendarNamesAry[0] } } diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html index f41950b82..d7dea0438 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.html +++ b/src/app/shared/chat/group-messages/group-messages.page.html @@ -59,10 +59,12 @@ - - - - + Enviado + + + + + Lido
Tentar
{{last ? scrollToBottom() : ''}} @@ -105,10 +107,13 @@ image - - - - + + Enviado + + + + + Lido
Tentar
@@ -160,10 +165,12 @@ - - - - + Enviado + + + + + Lido
Tentar
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html index f63c3c362..6579f65b8 100644 --- a/src/app/shared/chat/messages/messages.page.html +++ b/src/app/shared/chat/messages/messages.page.html @@ -60,11 +60,12 @@ - - - - - + Enviado + + + + + Lido
Tentar
{{last ? scrollToBottom() : ''}} @@ -105,10 +106,12 @@ image - - - - + Enviado + + + + + Lido
Tentar
@@ -171,10 +174,13 @@ - - - - + Enviado + + + + + Lido + Lida
Tentar
diff --git a/src/app/shared/chat/messages/messages.page.scss b/src/app/shared/chat/messages/messages.page.scss index 388f21c6c..a4b4e2997 100644 --- a/src/app/shared/chat/messages/messages.page.scss +++ b/src/app/shared/chat/messages/messages.page.scss @@ -404,4 +404,9 @@ ion-footer { } .red { color: red !important; +} + + +.lido, .enviado { + font-size: 11px; } \ No newline at end of file diff --git a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts index 12c4d4d7c..4f57e977a 100644 --- a/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts +++ b/src/app/shared/gabinete-digital/all-processes/all-processes.page.ts @@ -34,7 +34,8 @@ export class AllProcessesPage implements OnInit { totalDocumentStore = TotalDocumentStore deplomasStore = DeplomasStore - + AllProcess = [] + constructor( private router: Router, public ThemeService: ThemeService @@ -45,11 +46,12 @@ export class AllProcessesPage implements OnInit { ngOnInit() { // this.loadAllProcesses(); - + this.updateAllProcess() this.router.events.forEach((event) => { if (event instanceof NavigationStart && event.url.startsWith('/home/gabinete-digital')) { if (window.location.pathname.split('/').length >= 4 && window.location.pathname.startsWith('/home/gabinete-digital')) { this.refreshing(); + this.updateAllProcess() } else { // this.loadAllProcesses(); } @@ -71,14 +73,10 @@ export class AllProcessesPage implements OnInit { }, 1000); } - - get AllProcess() { - setTimeout(() => { - this.skeletonLoader = false; - }, 5000); - return this.expedientegbstore.list.concat(this.pedidosstore.listparecer).concat(this.pedidosstore.listdeferimento) - .concat(this.despachoprstore.list).concat(this.eventoaprovacaostore.listmd).concat(this.eventoaprovacaostore.listpr) - .concat(this.deplomasStore.diplomasParaAssinarList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.despachoStore.list) + updateAllProcess() { + this.AllProcess = this.expedientegbstore.list.concat(this.pedidosstore.listparecer).concat(this.pedidosstore.listdeferimento) + .concat(this.despachoprstore.list).concat(this.eventoaprovacaostore.listmd).concat(this.eventoaprovacaostore.listpr).concat(this.despachoStore.list) + .concat(this.deplomasStore.diplomasParaAssinarList).concat(this.deplomasStore.diplomasAssinadoList).concat(this.deplomasStore.DiplomaGerarList) } get getAllProcessCount() { diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html index 92b819d7d..0187c4f53 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -19,15 +19,15 @@
-

-

Presidente da República

+

Presidente da República

+

GABINETE DIGITAL

-

+

Presidente da República

GABINETE DIGITAL

@@ -56,8 +56,7 @@

Calendário Partilhado

-

-

Presidente da República

+

Presidente da República

GABINETE DIGITAL

diff --git a/version/git-version.ts b/version/git-version.ts index 777452693..d54fe47f1 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "5d9d67902", - "SHA": "5d9d67902c4b97402afbeb2b3287f41862edf912", + "shortSHA": "c9732f190", + "SHA": "c9732f190622872b2f8fb94b5f4bbd20380c4f09", "branch": "no_bug_movemente", "lastCommitAuthor": "'Eudes Inácio'", - "lastCommitTime": "'Tue Jan 17 14:34:54 2023 +0100'", - "lastCommitMessage": "undo remove of text presidente da republica", - "lastCommitNumber": "4638", + "lastCommitTime": "'Tue Jan 17 16:21:54 2023 +0100'", + "lastCommitMessage": "Bugs solved: Icon restored, expediente task created wrong moth, text remove from profile", + "lastCommitNumber": "4639", "change": "", - "changeStatus": "On branch no_bug_movemente\nYour branch is behind 'origin/no_bug_movemente' by 7 commits, and can be fast-forwarded.\n (use \"git pull\" to update your local branch)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: android/app/src/main/res/drawable-land-hdpi/splash.png\n\tnew file: android/app/src/main/res/drawable-land-ldpi/splash.png\n\tmodified: android/app/src/main/res/drawable-land-mdpi/splash.png\n\tmodified: android/app/src/main/res/drawable-land-xhdpi/splash.png\n\tmodified: android/app/src/main/res/drawable-land-xxhdpi/splash.png\n\tmodified: android/app/src/main/res/drawable-land-xxxhdpi/splash.png\n\tmodified: android/app/src/main/res/drawable-port-hdpi/splash.png\n\tnew file: android/app/src/main/res/drawable-port-ldpi/splash.png\n\tmodified: android/app/src/main/res/drawable-port-mdpi/splash.png\n\tmodified: android/app/src/main/res/drawable-port-xhdpi/splash.png\n\tmodified: android/app/src/main/res/drawable-port-xxhdpi/splash.png\n\tmodified: android/app/src/main/res/drawable-port-xxxhdpi/splash.png\n\tmodified: android/app/src/main/res/mipmap-hdpi/ic_launcher.png\n\tmodified: android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png\n\tmodified: android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png\n\tmodified: android/app/src/main/res/mipmap-mdpi/ic_launcher.png\n\tmodified: android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png\n\tmodified: android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png\n\tmodified: android/app/src/main/res/mipmap-xhdpi/ic_launcher.png\n\tmodified: android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png\n\tmodified: android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png\n\tmodified: android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png\n\tmodified: android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png\n\tmodified: android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png\n\tmodified: android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png\n\tmodified: android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png\n\tmodified: android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png\n\tmodified: src/app/modals/profile/profile.page.html\n\tmodified: src/app/pipes/expediente-task.pipe.ts", + "changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 1 and 7 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/pages/agenda/agenda.page.html\n\tmodified: src/app/pages/agenda/new-event/new-event.page.html\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/pages/chat/chat.page.ts\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.html\n\tmodified: src/app/pages/chat/messages/messages.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/pages/publications/new-action/new-action.page.ts\n\tmodified: src/app/services/chat/chat-system.service.ts\n\tmodified: src/app/shared/agenda/new-event/new-event.page.html\n\tmodified: src/app/shared/agenda/new-event/new-event.page.ts\n\tmodified: src/app/shared/chat/group-messages/group-messages.page.html\n\tmodified: src/app/shared/chat/messages/messages.page.html\n\tmodified: src/app/shared/chat/messages/messages.page.scss\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified: src/app/shared/header/header.page.html", "changeAuthor": "eudes.inacio" } \ No newline at end of file