From 67a69d2e4724ac828c2c0e09649b593ca6a2d021 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 8 Aug 2023 09:43:26 +0100 Subject: [PATCH] fix --- index.html | 1 + .../create-process/create-process.page.ts | 2 +- src/app/models/message.model.ts | 1 + .../pages/agenda/new-event/new-event.page.ts | 2 +- src/app/pages/chat/chat.page.ts | 3 +- .../chat/edit-group/edit-group.page.scss | 1 - .../group-messages/group-messages.page.html | 6 +- .../group-messages/group-messages.page.ts | 8 ++- src/app/pages/events/events.page.html | 6 +- src/app/pages/events/events.page.ts | 7 ++ .../despachos/despacho/despacho.page.ts | 6 +- .../diplomas-gerar/diplomas-gerar.page.ts | 2 +- .../gabinete-digital.page.html | 2 +- src/app/pages/login/login.page.ts | 1 - .../new-action/new-action.page.html | 10 +-- .../new-action/new-action.page.scss | 1 - .../new-action/new-action.page.ts | 17 +++-- .../pages/publications/publications.page.scss | 2 +- src/app/services/chat/message.service.ts | 1 + src/app/services/chat/room.service.ts | 69 ++++++++++++++++++- .../agenda/edit-event/edit-event.page.ts | 2 +- .../group-contacts/group-contacts.page.ts | 2 +- .../group-messages/group-messages.page.html | 6 +- .../popover/chat-popover/chat-popover.page.ts | 10 +-- .../new-action/new-action.page.html | 1 + src/global.scss | 26 +++++-- version/git-version.ts | 12 ++-- 27 files changed, 153 insertions(+), 54 deletions(-) create mode 100644 index.html diff --git a/index.html b/index.html new file mode 100644 index 000000000..a564f3577 --- /dev/null +++ b/index.html @@ -0,0 +1 @@ +https://wetransfer.com/downloads/48a9320a9b41c4b3bef97cfc0c42941620230803122443/778a91?utm_campaign=TRN_TDL_05&utm_source=sendgrid&utm_medium=email&trk=TRN_TDL_05 \ No newline at end of file diff --git a/src/app/modals/create-process/create-process.page.ts b/src/app/modals/create-process/create-process.page.ts index 0860cfae3..08c4404c7 100644 --- a/src/app/modals/create-process/create-process.page.ts +++ b/src/app/modals/create-process/create-process.page.ts @@ -196,7 +196,7 @@ export class CreateProcessPage implements OnInit { } cancelTask() { - this.modalController.dismiss(null); + this.modalController.dismiss({action:'cancel'}); } runValidation() { diff --git a/src/app/models/message.model.ts b/src/app/models/message.model.ts index 341262051..9c4702f26 100644 --- a/src/app/models/message.model.ts +++ b/src/app/models/message.model.ts @@ -35,6 +35,7 @@ export interface ChatMessageInterface { msg: string; file?: any; ts: number; + t?: string; u: { _id: string; username: string; 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 695a90364..0a400d74d 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/src/app/pages/agenda/new-event/new-event.page.ts @@ -333,7 +333,7 @@ export class NewEventPage implements OnInit { CalendarName: new FormControl(this.postEvent.CalendarName, [ Validators.required ]), - Date: new FormControl(new Date(this.postEvent.StartDate).getTime() <= new Date(this.postEvent.EndDate).getTime()? 'ok': null,[ + Date: new FormControl(new Date(this.postEvent.StartDate).getTime() < new Date(this.postEvent.EndDate).getTime()? 'ok': null,[ Validators.required ]), Categories: new FormControl(this.postEvent.Category, [ diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index 03bc3b0ab..9f21d4c31 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -290,7 +290,7 @@ export class ChatPage implements OnInit { this.selectContact(); } else { - + this.showEmptyComponent = false; this.showContacts = true; } } @@ -301,6 +301,7 @@ export class ChatPage implements OnInit { } else { this.closeAllDesktopComponents(); + this.showEmptyComponent = false; this.showNewGroup = true; } } diff --git a/src/app/pages/chat/edit-group/edit-group.page.scss b/src/app/pages/chat/edit-group/edit-group.page.scss index 2717a7a4e..69afe6491 100644 --- a/src/app/pages/chat/edit-group/edit-group.page.scss +++ b/src/app/pages/chat/edit-group/edit-group.page.scss @@ -49,7 +49,6 @@ ion-content{ transform: translate3d(0, 1px, 0); .title-content{ - width: 360px; margin: 0px auto; overflow: auto; padding: 0 !important; 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 8c0fa786d..d6a166595 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.html +++ b/src/app/pages/chat/group-messages/group-messages.page.html @@ -11,7 +11,7 @@
- {{groupNameFormart}} + {{ ChatSystemService.getGroupRoom(roomId).name }}
@@ -29,8 +29,8 @@
-
- +
+ {{member.name}},
diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts index 0af7de7ad..a5b28d838 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.ts +++ b/src/app/pages/chat/group-messages/group-messages.page.ts @@ -523,7 +523,8 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { await modal.present(); modal.onDidDismiss().then(res => { if (res.data == 'leave') { - + this.close() + this.ChatSystemService.deleteRoom(this.roomId) //this.ChatSystemService.subscribeToRoomUpdate(this.roomId, this.room); } else if (res.data == 'cancel') { @@ -534,7 +535,10 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { } else if (res.data == 'addUser') { this.addContacts(); - } + } else if (res.data == 'delete') { + this.close() + this.ChatSystemService.deleteRoom(this.roomId) + } }); } diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index fc1eb095d..8d6046961 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -110,7 +110,7 @@ -
+
{{event.StartDate | date: 'HH:mm'}}
@@ -229,12 +229,12 @@
- -
+ +
{{event.StartDate | date: 'HH:mm'}}
diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 819e6436d..98142366d 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -66,6 +66,8 @@ export class EventsPage implements OnInit { showCorrespondenciasLoader = false loadingAllTask = false + agendaColor = '' + filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Não lidos' showSearch = true; @@ -104,6 +106,11 @@ export class EventsPage implements OnInit { this.listToPresentexpediente = [] }) + + if(this.agendaColor != "PR") { + this.agendaColor = "MDGPR" + } + } ngAfterViewInit(): void { diff --git a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts index 3c98f1fb8..f2181c472 100644 --- a/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts +++ b/src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts @@ -482,7 +482,11 @@ export class DespachoPage implements OnInit { await this.distartExpedientModal(); } - this.goBack(); + + if(res.data?.action != 'cancel') { + this.goBack(); + } + }, (error) => { console.log(error) }); diff --git a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts index 4ab2083e6..8d9127911 100644 --- a/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts +++ b/src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts @@ -209,7 +209,7 @@ export class DiplomasGerarPage implements OnInit { this.httpErroHandle.httpsSucessMessagge('Enviar para Pendentes') this.TaskService.loadDiplomas() loader.remove() - }, + }, error => { loader.remove() this.httpErroHandle.httpStatusHandle(error) diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html index be5e26a73..d7f2d6d58 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.html +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html @@ -713,7 +713,7 @@ Pendentes
{{ TaskService.pendentesstore.newList.length}} correspondências novas - {{ + {{ TaskService.pendentesstore.newList.length}} correspondência nova

Meus diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index 3a6a82749..058fc3590 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -18,7 +18,6 @@ import { ChatService } from 'src/app/services/chat.service'; import { Platform } from '@ionic/angular'; import { FirstEnterService } from '../../services/first-enter.service'; import { Storage } from '@ionic/storage'; -import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; import { CPSession } from 'src/app/store/documentManagement'; @Component({ selector: 'app-login', diff --git a/src/app/pages/publications/new-action/new-action.page.html b/src/app/pages/publications/new-action/new-action.page.html index 637db6e74..cb0a77275 100644 --- a/src/app/pages/publications/new-action/new-action.page.html +++ b/src/app/pages/publications/new-action/new-action.page.html @@ -23,7 +23,7 @@

-
+
@@ -34,7 +34,7 @@ @@ -53,7 +53,7 @@
-
+
@@ -63,9 +63,9 @@ new Date(this.dateControlEnd.value).getTime()){ + if(new Date(this.dateControlStart).getTime() > new Date(this.dateControlEnd).getTime()){ this.toastService._badRequest("A data de início não pode ser superior a data de fim"); } } @@ -108,7 +107,7 @@ export class NewActionPage implements OnInit { Validators.required, // Validators.minLength(4) ]), - Date: new FormControl(this.dateValid, [ + Date: new FormControl( this.dateValid,[ Validators.required ]), Detail: new FormControl(this.folder.Detail, [ @@ -129,8 +128,8 @@ export class NewActionPage implements OnInit { ProcessId: null, Description: this.folder.Description, Detail: this.folder.Detail, - DateBegin: this.dateControlStart.value, - DateEnd: this.dateControlEnd.value, + DateBegin: this.dateControlStart, + DateEnd: this.dateControlEnd, ActionType: this.segment, } diff --git a/src/app/pages/publications/publications.page.scss b/src/app/pages/publications/publications.page.scss index 1ad4555fd..86a7097f3 100644 --- a/src/app/pages/publications/publications.page.scss +++ b/src/app/pages/publications/publications.page.scss @@ -189,7 +189,7 @@ ion-toolbar{ } .item:hover{ - background-color: var(--box-hover-background-color) !important; + background-color: var(--box-hover-background-color); } ion-item-options{ diff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts index e988717ea..c50e549c9 100644 --- a/src/app/services/chat/message.service.ts +++ b/src/app/services/chat/message.service.ts @@ -502,6 +502,7 @@ export class MessageService { ts: this.ts, u: this.u, _id: this._id, + t: this.t, id: this.id, hasFile: this.hasFile, origin: this.origin, diff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts index 7398111a8..de312b29e 100644 --- a/src/app/services/chat/room.service.ts +++ b/src/app/services/chat/room.service.ts @@ -360,6 +360,12 @@ export class RoomService { } + if(ChatMessage?.t == "au") { + this.updateContacts() + } else if (ChatMessage?.t == "r") { + this.name = ChatMessage.msg + } + setTimeout(() => { done() }, 5) @@ -949,14 +955,73 @@ export class RoomService { this.messageUnread = false } - addContacts(userId:any) { + async addContacts(userId:any) { let body = { "roomId": this.id, "userId": userId, } - return this.chatService.addUserToGroup(body).toPromise(); + await this.chatService.addUserToGroup(body).toPromise(); + this.ChatSystemService.getGroupRoom(this.id).updateContacts() } + + async updateContacts() { + + let res + let error = false + + if(this.t == 'd') { + + try { + res = await this.chatService.getMembers(this.id).toPromise(); + } catch (e) { + await this.chatService.refreshtoken(); + error = true + } + + if(error) { + res = await this.chatService.getMembers(this.id).toPromise(); + } + + } else { + if (this.t === 'p') { + + try { + res = await this.chatService.getGroupMembers(this.id).toPromise() + } catch (e) { + await this.chatService.refreshtoken(); + error = true + } + + if(error) { + res = await this.chatService.getGroupMembers(this.id).toPromise() + } + + + + } + else { + + try { + res = await this.chatService.getChannelMembers(this.id).toPromise() + + } catch (e) { + await this.chatService.refreshtoken(); + error = true + } + + if(error) { + res = await this.chatService.getChannelMembers(this.id).toPromise() + } + + } + } + + const members = res['members']; + const users = members.filter(data => data.username != this.sessionStore.user.UserName); + this.members = members + this.membersExcludeMe = users + } } diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/shared/agenda/edit-event/edit-event.page.ts index 19a8ed4ac..f8b98662e 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/src/app/shared/agenda/edit-event/edit-event.page.ts @@ -210,7 +210,7 @@ export class EditEventPage implements OnInit { participantes: new FormControl(this.taskParticipants, [ // Validators.required ]), - Date: new FormControl( new Date(this._postEvent.StartDate).toLocaleString('pt') <= new Date(this._postEvent.EndDate).toLocaleString('pt')? 'ok': null,[ + Date: new FormControl( new Date(this._postEvent.StartDate).toLocaleString('pt') < new Date(this._postEvent.EndDate).toLocaleString('pt')? 'ok': null,[ Validators.required ]), diff --git a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts index b25274e5e..436b4eccf 100644 --- a/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts +++ b/src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts @@ -264,7 +264,7 @@ export class GroupContactsPage implements OnInit { "userId":user._id, } this.chatService.addUserToGroup(body).subscribe(res=>{ - + this.ChatSystemService.getGroupRoom(roomId).updateContacts() }); }); } 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 178c29f5b..b3187bd9c 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.html +++ b/src/app/shared/chat/group-messages/group-messages.page.html @@ -3,7 +3,7 @@
- {{groupNameFormart }} + {{ ChatSystemService.getGroupRoom(roomId).name }}
-
- +
+ {{member.name}},
diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.ts b/src/app/shared/popover/chat-popover/chat-popover.page.ts index 5eed1907a..3a0f85821 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.page.ts +++ b/src/app/shared/popover/chat-popover/chat-popover.page.ts @@ -109,19 +109,19 @@ export class ChatPopoverPage implements OnInit { } //Delete - deleteGroup(){ - let body = { "roomId":this.roomId, } - this.chatService.getRoomInfo(this.roomId).subscribe(room=>{ + deleteGroup() { + let body = { "roomId":this.roomId } + this.chatService.getRoomInfo(this.roomId).subscribe(room => { this.room = room['room']; if(this.room.t === 'p') { this.chatService.deleteGroup(body).subscribe(res=>{ - this.ChatSystemService.deleteRoom(this.roomId) + // this.ChatSystemService.deleteRoom(this.roomId) }); } else { this.chatService.deleteChannel(body).subscribe(res=>{ - this.ChatSystemService.deleteRoom(this.roomId) + // this.ChatSystemService.deleteRoom(this.roomId) }); } }); diff --git a/src/app/shared/publication/new-action/new-action.page.html b/src/app/shared/publication/new-action/new-action.page.html index b5fc3edf9..28c97c75a 100644 --- a/src/app/shared/publication/new-action/new-action.page.html +++ b/src/app/shared/publication/new-action/new-action.page.html @@ -82,6 +82,7 @@ placeholder="Data de fim*" [(ngModel)]="folder.DateEnd" [disabled]="disabled" + [min]="folder.DateBegin" > ...\" to unstage)\n\tmodified: src/app/pages/search/search.page.ts", + "changeStatus": "On branch developer\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tnew file: index.html\n\tmodified: src/app/modals/create-process/create-process.page.ts\n\tmodified: src/app/models/message.model.ts\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/edit-group/edit-group.page.scss\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.html\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/pages/login/login.page.ts\n\tmodified: src/app/pages/publications/new-action/new-action.page.html\n\tmodified: src/app/pages/publications/new-action/new-action.page.scss\n\tmodified: src/app/pages/publications/new-action/new-action.page.ts\n\tmodified: src/app/pages/publications/publications.page.scss\n\tmodified: src/app/services/chat/message.service.ts\n\tmodified: src/app/services/chat/room.service.ts\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts\n\tmodified: src/app/shared/chat/group-messages/group-messages.page.html\n\tmodified: src/app/shared/popover/chat-popover/chat-popover.page.ts\n\tmodified: src/app/shared/publication/new-action/new-action.page.html\n\tmodified: src/global.scss", "changeAuthor": "peter.maquiran" } \ No newline at end of file