diff --git a/src/app/modals/create-process/create-process.page.html b/src/app/modals/create-process/create-process.page.html
index 6a79f0892..a779a8964 100644
--- a/src/app/modals/create-process/create-process.page.html
+++ b/src/app/modals/create-process/create-process.page.html
@@ -186,7 +186,7 @@
-
+
diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html
index 170570421..52e9e734e 100644
--- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html
+++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html
@@ -354,7 +354,7 @@
-
+
diff --git a/src/app/modals/forward/forward.page.html b/src/app/modals/forward/forward.page.html
index f62586fe1..d011f4cc2 100644
--- a/src/app/modals/forward/forward.page.html
+++ b/src/app/modals/forward/forward.page.html
@@ -78,7 +78,7 @@
-
+
diff --git a/src/app/pages/events/attendees/attendees.page.html b/src/app/pages/events/attendees/attendees.page.html
index 1c6a7a9f8..090a3af8a 100644
--- a/src/app/pages/events/attendees/attendees.page.html
+++ b/src/app/pages/events/attendees/attendees.page.html
@@ -90,7 +90,7 @@
diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html
index b9b08179b..4d1182eef 100644
--- a/src/app/pages/events/events.page.html
+++ b/src/app/pages/events/events.page.html
@@ -32,25 +32,25 @@
-
Tarefas que terminam hoje
+
Correspondências com prazo para hoje
{{ TaskService.deadline }}
-
Tarefas em atraso
+
Correspondências em atraso
{{ TaskService.overdueTasks }}
-
Novas tarefas
+
Novas Correspondências
{{ TaskService.new }}
-
Tarefas não lidas
+
Correspondências não lidas
{{ TaskService.unread }}
diff --git a/src/app/pages/events/events.page.scss b/src/app/pages/events/events.page.scss
index 479a3c04f..e610ac580 100644
--- a/src/app/pages/events/events.page.scss
+++ b/src/app/pages/events/events.page.scss
@@ -580,8 +580,8 @@ ion-title{
}
.event-box {
background-color: #ffb81c2b;
- width: 130px;
- height: 73px;
+ width: 150px;
+ height: 90px;
margin:5px;
flex-direction: column;
display: flex;
diff --git a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
index 03fb006a6..164c28b59 100644
--- a/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
+++ b/src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html
@@ -235,6 +235,6 @@
-
+
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.html b/src/app/pages/gabinete-digital/gabinete-digital.page.html
index d787b6401..28af2ace6 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.html
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.html
@@ -427,8 +427,8 @@
Eventos para Aprovação
- {{ TaskService.eventoaprovacaostore.newList.length}} correspondências novas
- {{ TaskService.eventoaprovacaostore.newList.length}} correspondência nova
+ {{ TaskService.eventoaprovacaostore.newList.length}} eventos novos
+ {{ TaskService.eventoaprovacaostore.newList.length}} evento novo
{{TaskService.eventoaprovacaostore.countAll}}
diff --git a/src/app/services/events/attendees/attendees.page.html b/src/app/services/events/attendees/attendees.page.html
index 9570c6f0d..a3ff11683 100644
--- a/src/app/services/events/attendees/attendees.page.html
+++ b/src/app/services/events/attendees/attendees.page.html
@@ -85,7 +85,7 @@
diff --git a/src/app/services/notifications.service.ts b/src/app/services/notifications.service.ts
index cbeca82ec..60bbec2e0 100644
--- a/src/app/services/notifications.service.ts
+++ b/src/app/services/notifications.service.ts
@@ -151,8 +151,9 @@ export class NotificationsService {
(notification: PushNotificationSchema) => {
this.active = true
-
+ console.log(notification)
this.storageService.get("Notifications").then((store) => {
+
store.push(notification)
this.storageService.store("Notifications", store)
}).catch((error) => {
@@ -178,6 +179,7 @@ export class NotificationsService {
PushNotifications.addListener('pushNotificationActionPerformed',
(notification: ActionPerformed) => {
this.active = true
+ console.log(notification)
/* this.DataArray.push(notification.notification)
this.storageService.store("Notifications", this.DataArray)
@@ -274,6 +276,12 @@ export class NotificationsService {
this.zone.run(() => this.router.navigate(['/home/gabinete-digital/diplomas-assinar', notification.notification.data.IdObject, 'gabinete-digital']));
}
+
+ else if (notification.notification.data.Service === "gabinete-digital" && notification.notification.data.Object === "diploma-revisao") {
+
+ this.zone.run(() => this.router.navigate(['/home/gabinete-digital/diplomas', notification.notification.data.IdObject, 'gabinete-digital']));
+ }
+
else if (notification.notification.data.Service === "gabinete-digital" && notification.notification.data.Object === "expedientes-pr") {
this.zone.run(() => this.router.navigate(['/home/gabinete-digital/expedientes-pr', notification.notification.data.IdObject, 'gabinete-digital']));
} else if (notification.notification.data.Service === "chat") {
diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts
index 49f9cda23..064ae293d 100644
--- a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts
+++ b/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts
@@ -15,6 +15,7 @@ import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
import { EventToApproveEdit } from 'src/app/models/event.model';
import { ThemeService } from 'src/app/services/theme.service'
import { Router } from '@angular/router';
+import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
const CUSTOM_DATE_FORMATS: NgxMatDateFormats = {
@@ -131,6 +132,7 @@ export class EditEventToApprovePage implements OnInit {
private processes:ProcessesService,
private toastService: ToastService,
public ThemeService: ThemeService,
+ public httpErrorHandler: HttpErrorHandle
) {
this.isEventEdited = false;
}
@@ -362,9 +364,10 @@ export class EditEventToApprovePage implements OnInit {
this.close()
- this.toastService._successMessage('Evento editado');
+ this.httpErrorHandler.httpsSucessMessagge('Editar evento');
} catch(e) {
+ this.httpErrorHandler.httpStatusHandle(e);
this.toastService._badRequest('Evento não editado');
}
diff --git a/src/app/shared/event/attendee-modal/attendee-modal.page.html b/src/app/shared/event/attendee-modal/attendee-modal.page.html
index 4a8db993c..b022d92fb 100644
--- a/src/app/shared/event/attendee-modal/attendee-modal.page.html
+++ b/src/app/shared/event/attendee-modal/attendee-modal.page.html
@@ -87,7 +87,7 @@
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 ab7c5e9c9..736f23b49 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
@@ -4,7 +4,7 @@ import { LoginUserRespose } from 'src/app/models/user.model';
import { ThemeService } from 'src/app/services/theme.service'
import { SessionStore } from 'src/app/store/session.service';
import { TaskService } from 'src/app/services/task.service'
-import MiniSearch from 'minisearch'
+/* import MiniSearch from 'minisearch' */
@Component({
selector: 'app-all-processes',
@@ -21,10 +21,10 @@ export class AllProcessesPage implements OnInit {
filterName: 'Para hoje' | 'Novos'| 'Lidos'| 'Não lidos'| 'OverdueTasks' | 'Todos' = 'Todos'
- miniSearch = new MiniSearch({
+ /* miniSearch = new MiniSearch({
fields: ['Folio', 'Senders'], // fields to index for full-text search
idField: 'DocId'
- })
+ }) */
AllProcess = []
ordinance: string = 'old'
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index 5bb822335..726ebb13e 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -3,4 +3,5 @@ import { oaprProd } from './suport/oapr'
import { doneITProd } from './suport/doneIt'
import { DevDev } from './suport/dev'
-export const environment: Environment = DevDev;
\ No newline at end of file
+
+export const environment: Environment = oaprProd;
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 16a865ce9..e2d79dff9 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -4,4 +4,4 @@ import { doneITDev } from './suport/doneIt'
import { DevDev } from './suport/dev'
-export const environment: Environment = DevDev
\ No newline at end of file
+export const environment: Environment = oaprDev
\ No newline at end of file
diff --git a/version/git-version.ts b/version/git-version.ts
index e36d4539c..a933da115 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
export let versionData = {
- "shortSHA": "2688b1e01",
- "SHA": "2688b1e0128c17f8ad7d85518287afbfb3f8f4d9",
+ "shortSHA": "72f396a3b",
+ "SHA": "72f396a3b93a365f5f7738b5f2eb9b9f6fd3cfe0",
"branch": "feature/gabinete-search",
"lastCommitAuthor": "'Peter Maquiran'",
- "lastCommitTime": "'Sun Jun 11 20:17:10 2023 +0100'",
- "lastCommitMessage": "performance",
- "lastCommitNumber": "4977",
+ "lastCommitTime": "'Sun Jun 11 20:18:21 2023 +0100'",
+ "lastCommitMessage": "remove code",
+ "lastCommitNumber": "4978",
"change": "",
- "changeStatus": "On branch feature/gabinete-search\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.ts",
+ "changeStatus": "On branch feature/gabinete-search\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/create-process/create-process.page.html\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified: src/app/modals/forward/forward.page.html\n\tmodified: src/app/pages/events/attendees/attendees.page.html\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/events/events.page.scss\n\tmodified: src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.html\n\tmodified: src/app/services/events/attendees/attendees.page.html\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts\n\tmodified: src/app/shared/event/attendee-modal/attendee-modal.page.html\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified: src/environments/environment.prod.ts\n\tmodified: src/environments/environment.ts\n\tmodified: version/git-version.ts",
"changeAuthor": "peter.maquiran"
}
\ No newline at end of file