From ab9e828b79de65fd61fb5d991cef58a296efbfcb Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 17 Jan 2023 14:25:32 +0100 Subject: [PATCH 1/6] add descriptions --- src/app/shared/header/header.page.html | 7 ++++--- version/git-version.ts | 14 +++++++------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/app/shared/header/header.page.html b/src/app/shared/header/header.page.html index 8e7cd9824..0187c4f53 100644 --- a/src/app/shared/header/header.page.html +++ b/src/app/shared/header/header.page.html @@ -19,14 +19,15 @@
-

+

Presidente da República

+

GABINETE DIGITAL

-

+

Presidente da República

GABINETE DIGITAL

@@ -55,7 +56,7 @@

Calendário Partilhado

-

+

Presidente da República

GABINETE DIGITAL

diff --git a/version/git-version.ts b/version/git-version.ts index d2dc25d6d..baf048943 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "cb9e9f266", - "SHA": "cb9e9f2667180616a340ff7f6b751f07622f70cd", + "shortSHA": "d5827a184", + "SHA": "d5827a1840926e923fef18b48713ca94daeaffe3", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Tue Jan 17 12:16:48 2023 +0100'", - "lastCommitMessage": "merge", - "lastCommitNumber": "4636", - "change": "diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts\nindex 954089660..6fe433f8a 100644\n--- a/src/app/home/home.page.ts\n+++ b/src/app/home/home.page.ts\n@@ -126,6 +126,12 @@ export class HomePage implements OnInit {\n \n }\n \n+ window.addEventListener('storage', (event) => {\n+ // When local storage changes, dump the list to\n+ // the console.\n+ console.log(event);\n+ });\n+\n }\n \n goto(url) {\ndiff --git a/src/app/models/beast-orm.ts b/src/app/models/beast-orm.ts\nindex 8edea3bb2..2aa6e8069 100644\n--- a/src/app/models/beast-orm.ts\n+++ b/src/app/models/beast-orm.ts\n@@ -11,6 +11,7 @@ export class MessageModel extends models.Model {\n \tts = JsonField({blank:true})\n \tu = JsonField()\n \t_id = models.CharField({blank:true})\n+\torigin = models.CharField({blank:true})\n \t_updatedAt = models.IntegerField()\n \tmessageSend = models.BooleanField()\n \toffline = models.BooleanField()\n@@ -41,7 +42,7 @@ export class DeleteMessageModel extends models.Model {\n models.register({\n databaseName: 'chat-storage'+environment.version.lastCommitNumber,\n type: 'indexedDB',\n- version: 10,\n+ version: 11,\n models: [MessageModel, DeleteMessageModel, attachments]\n })\n \ndiff --git a/src/app/models/chatMethod.ts b/src/app/models/chatMethod.ts\nindex 73570fa16..56ee9fa79 100644\n--- a/src/app/models/chatMethod.ts\n+++ b/src/app/models/chatMethod.ts\n@@ -75,6 +75,7 @@ export interface Message {\n u: U;\n \tfrom: 'Offline'|'History'|'stream'| 'send' \n t: string;\n+\torigin: 'history' | 'stream' | 'local'\n _updatedAt: '';\n mentions: any[];\n channels: any[];\ndiff --git a/src/app/models/message.model.ts b/src/app/models/message.model.ts\nindex 732672370..341262051 100644\n--- a/src/app/models/message.model.ts\n+++ b/src/app/models/message.model.ts\n@@ -43,6 +43,7 @@ export interface ChatMessageInterface {\n _updatedAt: number;\n mentions: any[];\n channels: any[];\n+ origin?: 'history' | 'stream' | 'local'\n };\n \n \ndiff --git a/src/app/services/chat/message.service.ts b/src/app/services/chat/message.service.ts\nindex 5926dbdee..83255aa43 100644\n--- a/src/app/services/chat/message.service.ts\n+++ b/src/app/services/chat/message.service.ts\n@@ -61,6 +61,9 @@ export class MessageService {\n downloadAttachmentsTemp = 0;\n UploadAttachmentsTemp = 0;\n manualRetry = false\n+ origin: 'history' | 'stream' | 'local'\n+\n+ rowInstance: MessageModel\n \n constructor(\n private NfService: NfService,\n@@ -72,7 +75,7 @@ export class MessageService {\n private ChatSystemService: ChatSystemService) {\n }\n \n- setData({customFields = {}, channels, mentions, msg ,rid ,ts, u, t, _id, id, _updatedAt, file, attachments, temporaryData, localReference = 'out-'+uuidv4() , viewed = [], received = [], delate = false, delateRequest =false, from, sendAttempt = 0 }:Message) {\n+ setData({customFields = {}, channels, mentions, msg ,rid ,ts, u, t, _id, id, _updatedAt, file, attachments, temporaryData, localReference = 'out-'+uuidv4() , viewed = [], received = [], delate = false, delateRequest =false, from, sendAttempt = 0, origin }:Message) {\n \n this.channels = channels || []\n this.mentions = mentions || []\n@@ -90,6 +93,7 @@ export class MessageService {\n this.delate = delate\n this.delateRequest = delateRequest\n this.sendAttempt = 0\n+ this.origin = origin\n \n if(this.attachments?.length >= 1 && attachments?.length >= 1) {\n this.attachments[0] = Object.assign(this.attachments[0], attachments[0])\n@@ -257,6 +261,7 @@ export class MessageService {\n } catch (error) {\n this.uploadingFile = false\n this.errorUploadingAttachment = true\n+ this.UploadAttachmentsTemp++\n console.error('beforeSendAttachment error:', error)\n \n }\n@@ -467,6 +472,7 @@ export class MessageService {\n u: this.u,\n _id: this._id,\n id: this.id,\n+ origin: this.origin,\n _updatedAt: this._updatedAt,\n messageSend: this.messageSend,\n offline: this.offline,\n@@ -489,6 +495,7 @@ export class MessageService {\n delete message.id\n const createdMessage = await MessageModel.create(message)\n \n+ this.rowInstance = createdMessage\n this.id = createdMessage.id\n \n if(this.earlySave) {\n@@ -497,8 +504,8 @@ export class MessageService {\n }\n }\n \n- async saveChanges() {\n \n+ async getRowInstance () {\n \n if(this.save) {\n const message = this.getChatObj()\n@@ -516,12 +523,29 @@ export class MessageService {\n a = await MessageModel.get({id: this.id})\n }\n \n- if(a) {\n- for( const [name, value] of Object.entries(message)) {\n- a[name] = value\n- }\n- await a.save()\n+ return a\n+ }\n+ \n+ }\n+\n+ async saveChanges() {\n+\n+ if(!this.rowInstance) {\n+ this.rowInstance = await this.getRowInstance()\n+ }\n+\n+ if(this.save && this.rowInstance) {\n+ const message = this.getChatObj()\n+\n+ if(!message.id) {\n+ delete message.id\n+ }\n+\n+ for( const [name, value] of Object.entries(message)) {\n+ this.rowInstance[name] = value\n }\n+ \n+ await this.rowInstance.save()\n \n } else {\n this.earlySave = true\ndiff --git a/src/app/services/chat/room.service.ts b/src/app/services/chat/room.service.ts\nindex a5a4d20ca..b67bfc32e 100644\n--- a/src/app/services/chat/room.service.ts\n+++ b/src/app/services/chat/room.service.ts\n@@ -275,18 +275,25 @@ export class RoomService {\n if(message.fields.eventName == this.id+'/'+'typing') {\n \n const args = message.fields.args\n- \n+\n if (typeof args[1] != 'object') {\n this.userThatIsTyping = this.usernameToDisplayName(args[0])\n \n this.isTyping = args[1]\n this.otherUserType = args[1]\n- this.readAllMessage()\n \n+ const user = args[0]\n+ if(SessionStore.user.UserName != user) {\n+ this.readAllMessage()\n+ }\n \n } else if(args[0]?.method == 'viewMessage' || args[1]?.method == 'viewMessage') {\n- \n- this.readAllMessage()\n+ const user = args[0]\n+\n+ if(SessionStore.user.UserName != user) {\n+ this.readAllMessage()\n+ }\n+\n } else if(args[0]?.method == 'deleteMessage' || args[1]?.method == 'deleteMessage') {\n \n this.deleteMessage(args[1]?.method?._id)\n@@ -295,7 +302,6 @@ export class RoomService {\n \n }\n \n-\n } else if (message.fields.eventName == this.id+'/'+'deleteMessage') {}\n \n })\n@@ -313,6 +319,7 @@ export class RoomService {\n \n if(!found) {\n \n+ ChatMessage.origin = 'stream' \n const message = await this.prepareCreate({message: ChatMessage, save: true});\n this.registerSendMessage(message)\n \n@@ -556,7 +563,8 @@ export class RoomService {\n attachments,\n file,\n temporaryData,\n- localReference\n+ localReference,\n+ origin: 'local'\n }\n \n this.message= ''\n@@ -657,6 +665,7 @@ export class RoomService {\n // this.typing(this.message)\n this.chatOpen = true\n this.messageUnread = false\n+ this.sendReadMessage()\n }\n \n \n@@ -737,6 +746,7 @@ export class RoomService {\n \n for(let message of chatHistory.result.messages.reverse()) {\n if (!messagesId.includes(message._id)) {\n+ message.origin = 'history'\n const messagesToSave = await this.prepareMessageCreateIfNotExist({message: message});\n if(messagesToSave != null) {\n \ndiff --git a/src/app/services/chat/viewed-message.service.ts b/src/app/services/chat/viewed-message.service.ts\nindex 7266b57ae..9411d766d 100644\n--- a/src/app/services/chat/viewed-message.service.ts\n+++ b/src/app/services/chat/viewed-message.service.ts\n@@ -27,9 +27,9 @@ export class ViewedMessageService {\n for(let id of membersIds) {\n if(message.addReceived(id)) {\n n++\n- setTimeout(async() => {\n+ // setTimeout(async() => {\n await message.saveChanges()\n- }, 100 * n)\n+ // }, 100 * n)\n }\n }\n }\n@@ -56,9 +56,9 @@ export class ViewedMessageService {\n if(message.addViewed(id)) {\n message.addReceived(id)\n n++\n- setTimeout(async() => {\n+ // setTimeout(async() => {\n await message.saveChanges()\n- }, 100 * n)\n+ // }, 100 * n)\n \n }\n }", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/agenda.page.html\n\nChanges not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\n\tmodified: src/app/home/home.page.ts\n\tmodified: src/app/models/beast-orm.ts\n\tmodified: src/app/models/chatMethod.ts\n\tmodified: src/app/models/message.model.ts\n\tmodified: src/app/services/chat/message.service.ts\n\tmodified: src/app/services/chat/room.service.ts\n\tmodified: src/app/services/chat/viewed-message.service.ts", + "lastCommitTime": "'Tue Jan 17 14:14:53 2023 +0100'", + "lastCommitMessage": "fix", + "lastCommitNumber": "4637", + "change": "", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/shared/header/header.page.html", "changeAuthor": "peter.maquiran" } \ No newline at end of file From 407c838346a287cb56631e4b92a262906ca16134 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 17 Jan 2023 14:47:30 +0100 Subject: [PATCH 2/6] add bold on message --- src/app/pages/chat/chat.page.ts | 6 +++--- src/app/services/chat/chat-system.service.ts | 1 - version/git-version.ts | 12 ++++++------ 3 files changed, 9 insertions(+), 10 deletions(-) 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/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/version/git-version.ts b/version/git-version.ts index baf048943..5fce4f72a 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "d5827a184", - "SHA": "d5827a1840926e923fef18b48713ca94daeaffe3", + "shortSHA": "ab9e828b7", + "SHA": "ab9e828b79de65fd61fb5d991cef58a296efbfcb", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Tue Jan 17 14:14:53 2023 +0100'", - "lastCommitMessage": "fix", - "lastCommitNumber": "4637", + "lastCommitTime": "'Tue Jan 17 14:25:32 2023 +0100'", + "lastCommitMessage": "add descriptions", + "lastCommitNumber": "4638", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/shared/header/header.page.html", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/chat/chat.page.ts\n\tmodified: src/app/services/chat/chat-system.service.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file From 15dc36859a9c3921f2d7409d1970a5fc8074077e Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 17 Jan 2023 15:36:09 +0100 Subject: [PATCH 3/6] message --- .../group-messages/group-messages.page.html | 33 +++++++++++-------- .../pages/chat/messages/messages.page.html | 31 +++++++++-------- .../group-messages/group-messages.page.html | 31 ++++++++++------- .../shared/chat/messages/messages.page.html | 32 ++++++++++-------- .../shared/chat/messages/messages.page.scss | 5 +++ version/git-version.ts | 12 +++---- 6 files changed, 86 insertions(+), 58 deletions(-) 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/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/version/git-version.ts b/version/git-version.ts index 6c049531b..9777b09d6 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "407c83834", - "SHA": "407c838346a287cb56631e4b92a262906ca16134", + "shortSHA": "23652f9e7", + "SHA": "23652f9e7cbd6f26d6c6c98edc5411e9c02bf82e", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Tue Jan 17 14:47:30 2023 +0100'", - "lastCommitMessage": "add bold on message", - "lastCommitNumber": "4639", + "lastCommitTime": "'Tue Jan 17 14:50:00 2023 +0100'", + "lastCommitMessage": "fix", + "lastCommitNumber": "4641", "change": "", - "changeStatus": "On branch no_bug_movemente\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/profile/profile.page.html\n\tmodified: version/git-version.ts", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\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/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", "changeAuthor": "peter.maquiran" } \ No newline at end of file From 21ec78023f6ee2b53272b04c6802a10d5bdf834c Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 17 Jan 2023 15:43:54 +0100 Subject: [PATCH 4/6] invalid date --- .../pages/publications/new-action/new-action.page.ts | 2 +- version/git-version.ts | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) 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/version/git-version.ts b/version/git-version.ts index 9777b09d6..335869643 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "23652f9e7", - "SHA": "23652f9e7cbd6f26d6c6c98edc5411e9c02bf82e", + "shortSHA": "15dc36859", + "SHA": "15dc36859a9c3921f2d7409d1970a5fc8074077e", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Tue Jan 17 14:50:00 2023 +0100'", - "lastCommitMessage": "fix", - "lastCommitNumber": "4641", + "lastCommitTime": "'Tue Jan 17 15:36:09 2023 +0100'", + "lastCommitMessage": "message", + "lastCommitNumber": "4642", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\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/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", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/publications/new-action/new-action.page.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file From 252157df19a1afcedf7ed740291a1a63d1098dad Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 17 Jan 2023 15:53:17 +0100 Subject: [PATCH 5/6] improve agenda --- src/app/pages/agenda/agenda.page.html | 2 +- version/git-version.ts | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) 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/version/git-version.ts b/version/git-version.ts index 335869643..384e57962 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "15dc36859", - "SHA": "15dc36859a9c3921f2d7409d1970a5fc8074077e", + "shortSHA": "21ec78023", + "SHA": "21ec78023f6ee2b53272b04c6802a10d5bdf834c", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Tue Jan 17 15:36:09 2023 +0100'", - "lastCommitMessage": "message", - "lastCommitNumber": "4642", + "lastCommitTime": "'Tue Jan 17 15:43:54 2023 +0100'", + "lastCommitMessage": "invalid date", + "lastCommitNumber": "4643", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/publications/new-action/new-action.page.ts", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/agenda.page.html", "changeAuthor": "peter.maquiran" } \ No newline at end of file From 85eafdea13c8cdf0e437d351fd0abf5ba7801952 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Tue, 17 Jan 2023 16:11:56 +0100 Subject: [PATCH 6/6] fix gabinete --- .../pages/agenda/new-event/new-event.page.html | 2 +- .../pages/agenda/new-event/new-event.page.ts | 16 +++++++--------- .../gabinete-digital.page.html | 4 ++-- .../gabinete-digital/gabinete-digital.page.ts | 2 +- .../agenda/new-event/new-event.page.html | 2 +- .../shared/agenda/new-event/new-event.page.ts | 2 +- .../all-processes/all-processes.page.ts | 18 ++++++++---------- version/git-version.ts | 14 +++++++------- 8 files changed, 28 insertions(+), 32 deletions(-) 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/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/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/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/version/git-version.ts b/version/git-version.ts index 384e57962..062d7099b 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "21ec78023", - "SHA": "21ec78023f6ee2b53272b04c6802a10d5bdf834c", + "shortSHA": "252157df1", + "SHA": "252157df19a1afcedf7ed740291a1a63d1098dad", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Tue Jan 17 15:43:54 2023 +0100'", - "lastCommitMessage": "invalid date", - "lastCommitNumber": "4643", - "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/agenda.page.html", + "lastCommitTime": "'Tue Jan 17 15:53:17 2023 +0100'", + "lastCommitMessage": "improve agenda", + "lastCommitNumber": "4644", + "change": "diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/pages/agenda/new-event/new-event.page.html\nindex 38d2679d0..f6323e183 100644\n--- a/src/app/pages/agenda/new-event/new-event.page.html\n+++ b/src/app/pages/agenda/new-event/new-event.page.html\n@@ -30,7 +30,7 @@\n \n \n
Agenda de {{calendars}}
\n-
Agenda de {{loggeduser.FullName}}
\n+
Agenda de {{loggeduser.FullName}}
\n \n \n \ndiff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/pages/agenda/new-event/new-event.page.ts\nindex a1bf277c6..5eaaa4bbc 100644\n--- a/src/app/pages/agenda/new-event/new-event.page.ts\n+++ b/src/app/pages/agenda/new-event/new-event.page.ts\n@@ -103,15 +103,6 @@ export class NewEventPage implements OnInit {\n this.selectedDate = this.navParams.get('eventSelectedDate');\n this.taskParticipants = this.navParams.get('attendees');\n \n-\n- if(!this.CalendarName) {\n- if(this.eventService.calendarNamesAry.includes('Meu calendario')) {\n- this.CalendarName = 'Meu calendario';\n- } else if(this.eventService.calendarNamesAry.length == 1 ) {\n- this.CalendarName = this.eventService.calendarNamesAry[0]\n- }\n- }\n-\n }\n \n ngOnInit() {\n@@ -119,6 +110,13 @@ export class NewEventPage implements OnInit {\n this.CalendarName = this.loggeduser.Profile;\n this.selectedRecurringType = \"-1\";\n \n+ if(!this.CalendarName) {\n+ if(this.eventService.calendarNamesAry.includes('Meu calendario')) {\n+ this.CalendarName = 'Meu calendario';\n+ } else {\n+ this.CalendarName = this.eventService.calendarNamesAry[0]\n+ }\n+ }\n \n \n this.getRecurrenceTypes();\ndiff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/shared/agenda/new-event/new-event.page.html\nindex 34b8207b2..0be3e0bc3 100644\n--- a/src/app/shared/agenda/new-event/new-event.page.html\n+++ b/src/app/shared/agenda/new-event/new-event.page.html\n@@ -41,7 +41,7 @@\n \n \n
Agenda de {{calendars}}
\n-
Agenda de {{loggeduser.FullName}}
\n+
Agenda de {{loggeduser.FullName}}
\n \n \n \ndiff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/shared/agenda/new-event/new-event.page.ts\nindex 5b5a67ed9..fbc5844a7 100644\n--- a/src/app/shared/agenda/new-event/new-event.page.ts\n+++ b/src/app/shared/agenda/new-event/new-event.page.ts\n@@ -140,7 +140,7 @@ export class NewEventPage implements OnInit {\n if(!this.CalendarName) {\n if(this.eventService.calendarNamesAry.includes('Meu calendario')) {\n this.CalendarName = 'Meu calendario';\n- } else if(this.eventService.calendarNamesAry.length == 1 ) {\n+ } else {\n this.CalendarName = this.eventService.calendarNamesAry[0]\n }\n }", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\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/shared/gabinete-digital/all-processes/all-processes.page.ts\n\nChanges not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git restore ...\" to discard changes in working directory)\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/shared/agenda/new-event/new-event.page.html\n\tmodified: src/app/shared/agenda/new-event/new-event.page.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file