diff --git a/src/app/modals/document-detail/document-detail.page.html b/src/app/modals/document-detail/document-detail.page.html index 3c2b19df5..c75e7ad1d 100644 --- a/src/app/modals/document-detail/document-detail.page.html +++ b/src/app/modals/document-detail/document-detail.page.html @@ -80,8 +80,7 @@
- - +
diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index e4fab7593..48c894825 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -1058,7 +1058,7 @@ export class AgendaPage implements OnInit { updateEventListBox() { - if (window.innerWidth < 800) { + if (window.innerWidth < 768) { switch (this.segment) { case "Combinado": diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts index e4b28faa4..78bef112d 100644 --- a/src/app/pages/chat/messages/messages.page.ts +++ b/src/app/pages/chat/messages/messages.page.ts @@ -385,7 +385,7 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy { sendMessage(msg) { let lastMsg = msg.pop(); - console.log(this.attendees) + console.log(msg) console.log(lastMsg._id,lastMsg.msg,lastMsg.msg) this.ChatSystemService.getDmRoom(this.roomId).send({}).then(() => { console.log(this.members) diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index b488a22b0..14146b5c8 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -672,7 +672,6 @@ export class GabineteDigitalPage implements OnInit { let deferimentos = await this.processesbackend.GetTasksList("Pedido de Deferimento", false).toPromise(); this.pedidosstore.countdeferimento = Object.keys(deferimentos.filter(data => data.workflowInstanceDataFields.Status == "Active")).length - this.pedidosstore.resetdeferimento(deferimentos.filter(data => data.workflowInstanceDataFields.Status == "Active").map((element) => { return { "SerialNumber": element.serialNumber, diff --git a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html index c183c94b2..9ce2097e3 100644 --- a/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html +++ b/src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html @@ -126,8 +126,7 @@
- - + @@ -136,8 +135,7 @@
- - + @@ -146,8 +144,7 @@
- - + @@ -163,8 +160,7 @@
- - + diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index d4b2e2474..ebb78c083 100644 --- a/src/app/pages/search/search.page.ts +++ b/src/app/pages/search/search.page.ts @@ -608,10 +608,10 @@ export class SearchPage implements OnInit { } this.loadWordCloud(); - },error => { + }, error => { counter++; - if(counter ==2){ + if(counter == 2) { this.showLoader = false; } this.searchResult = "Registo não encontrado" diff --git a/src/app/services/notifications.service.ts b/src/app/services/notifications.service.ts index d74e92b8b..b04c93800 100644 --- a/src/app/services/notifications.service.ts +++ b/src/app/services/notifications.service.ts @@ -176,16 +176,17 @@ export class NotificationsService { const headers = { 'Authorization': SessionStore.user.BasicAuthKey }; const body = { - UserId: 437, - title: "Teste", - body: "Test", + UserId: userID, + title: title, + body: bodymsg, data: { Service: "chat", IdObject: roomId } }; let id = 437 - this.http.post(geturl+`?userId=${id}&title=${title}&body=${bodymsg}`, body, { headers }).subscribe(data => { + console.log(userID,title,bodymsg,roomId) + this.http.post(geturl+`?userId=${userID}&title=${title}&body=${bodymsg}`, body, { headers }).subscribe(data => { this.active = true console.log(data) }, (error) => { diff --git a/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html b/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html index 692456d7e..e5920fe6c 100644 --- a/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html +++ b/src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html @@ -1,7 +1,6 @@
- - +
diff --git a/src/app/shared/popover/request-options/request-options.page.html b/src/app/shared/popover/request-options/request-options.page.html index 87bb35a98..307bd76b9 100644 --- a/src/app/shared/popover/request-options/request-options.page.html +++ b/src/app/shared/popover/request-options/request-options.page.html @@ -4,8 +4,7 @@
- - + @@ -15,8 +14,7 @@
- - + @@ -26,8 +24,7 @@
- - + @@ -46,8 +43,7 @@
- - + diff --git a/src/app/shared/popover/searched-document-options/searched-document-options.page.html b/src/app/shared/popover/searched-document-options/searched-document-options.page.html index a712dbd6e..6068cd928 100644 --- a/src/app/shared/popover/searched-document-options/searched-document-options.page.html +++ b/src/app/shared/popover/searched-document-options/searched-document-options.page.html @@ -1,7 +1,6 @@
- - +
diff --git a/src/environments/suport/oapr.ts b/src/environments/suport/oapr.ts index b70ae5731..9e95e4e7e 100644 --- a/src/environments/suport/oapr.ts +++ b/src/environments/suport/oapr.ts @@ -29,7 +29,7 @@ export const oaprDev: Environment = { production: false, domain: 'oapr.gov.ao', defaultuser: 'gmanuel@oapr.gov.ao', - defaultuserpwd: 'Tabteste@006', + defaultuserpwd: 'M@p#2023', chatOffline: true, presidencial: true, version: versionData, diff --git a/version/git-version.ts b/version/git-version.ts index 25dab8556..a9490c9fd 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "9fea5d848", - "SHA": "9fea5d8488ddc4e3eb55d0be1821d0e21ec6974a", + "shortSHA": "32fb80f1b", + "SHA": "32fb80f1bb3ab1f94c9ae0c4f2f1987ae6dda323", "branch": "no_bug_movemente", - "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Wed Jan 25 15:49:16 2023 +0100'", - "lastCommitMessage": "fix search", - "lastCommitNumber": "4690", + "lastCommitAuthor": "'Eudes Inácio'", + "lastCommitTime": "'Mon Jan 30 15:08:00 2023 +0100'", + "lastCommitMessage": "Notificaion from chat added", + "lastCommitNumber": "4691", "change": "", - "changeStatus": "On branch no_bug_movemente\nYour branch is behind 'origin/no_bug_movemente' by 1 commit, 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: package-lock.json\n\tmodified: package.json\n\tmodified: src/app/modals/profile/profile.page.ts\n\tmodified: src/app/pages/chat/messages/messages.page.html\n\tmodified: src/app/pages/chat/messages/messages.page.ts\n\tmodified: src/app/services/chat/message.service.ts\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/environments/environment.ts", + "changeStatus": "On branch no_bug_movemente\nYour branch and 'origin/no_bug_movemente' have diverged,\nand have 1 and 3 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/document-detail/document-detail.page.html\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/chat/messages/messages.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html\n\tmodified: src/app/pages/search/search.page.ts\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/app/shared/popover/event-details-documents-options/event-details-documents-options.page.html\n\tmodified: src/app/shared/popover/request-options/request-options.page.html\n\tmodified: src/app/shared/popover/searched-document-options/searched-document-options.page.html\n\tmodified: src/environments/suport/oapr.ts", "changeAuthor": "eudes.inacio" } \ No newline at end of file