diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
index c528f8b2e..1bc6b9bed 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
+++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html
@@ -66,15 +66,13 @@
Documentos Anexados
-
-
- {{ attachment.Assunto }}Rascunho
- {{ attachment.DocNumber }}
- {{attachment.Sender}}{{ attachment.DocDate | date: 'dd/MM/yy' }}
-
-
+
+
+ {{ attachment.Assunto }}Rascunho
+ {{ attachment.DocNumber }}
+ {{attachment.Sender}}{{ attachment.DocDate | date: 'dd/MM/yy' }}
+
+
diff --git a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
index df1ca63a5..f91363f53 100644
--- a/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
+++ b/src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts
@@ -76,14 +76,6 @@ export class DespachoPrPage implements OnInit {
this.profile = "mdgpr";
- this.activateRoute.paramMap.subscribe(paramMap => {
- if (!paramMap.has('SerialNumber')) {
- return;
- }
- /* this.serialNumber = paramMap.get('SerialNumber'); */
- this.LoadTaskDetail(this.serialNumber);
- // this.LoadRelatedEvents(this.serialNumber);
- });
this.LoadTaskDetail(this.serialNumber);
// this.LoadRelatedEvents(this.serialNumber);
@@ -610,6 +602,7 @@ export class DespachoPrPage implements OnInit {
}
getDocumentPdf(Documents: any) {
+ this.mergedArray = []
Documents.forEach(element => {
let docObject = {
"ApplicationId": element.ApplicationId,
diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
index 85c87164a..7c72d8c43 100644
--- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts
+++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts
@@ -79,6 +79,10 @@ export class EventListPage implements OnInit {
if(pr) {
this.segment = pr.OwnerUserId
}
+
+ this.dynamicSearch()
+ } else {
+ this.dynamicSearch()
}
})
diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
index e1baa15b5..c42856866 100644
--- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
+++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts
@@ -21,8 +21,6 @@ import { ThemeService } from 'src/app/services/theme.service'
export class EventsToApprovePage implements OnInit {
showLoader: boolean;
- eventsPRList: any = [];
- eventsMDGPRList: any = [];
eventPerson: EventPerson;
eventBody: EventBody;
categories: string[];
@@ -76,7 +74,12 @@ export class EventsToApprovePage implements OnInit {
if(pr) {
this.segment = pr.OwnerUserId
}
+
+ this.dynamicSearch();
+ } else {
+ this.dynamicSearch();
}
+
})
this.LoadToApproveEvents()
@@ -210,15 +213,7 @@ export class EventsToApprovePage implements OnInit {
}
- getFromDB() {
- this.storage.get('event-to-aproveMD').then((events = []) => {
- this.eventsMDGPRList = events
- })
-
- this.storage.get('event-to-aprovePR').then((events) => {
- this.eventsPRList = events
- })
- }
+ getFromDB() {}
toDateString(e) {
diff --git a/version/git-version.ts b/version/git-version.ts
index 8c1aa1533..25a39cedf 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
export let versionData = {
- "shortSHA": "6812e4395",
- "SHA": "6812e43958c64ad6ed0f86944995b90c08142a45",
+ "shortSHA": "c7d58f46a",
+ "SHA": "c7d58f46a9937d575b05904888447b5dcd5a4ee0",
"branch": "developer-catch-merge",
"lastCommitAuthor": "'Peter Maquiran'",
- "lastCommitTime": "'Mon Jul 17 11:29:37 2023 +0100'",
- "lastCommitMessage": "fix chat",
- "lastCommitNumber": "5084",
+ "lastCommitTime": "'Mon Jul 17 15:07:08 2023 +0100'",
+ "lastCommitMessage": "fix evento",
+ "lastCommitNumber": "5085",
"change": "",
- "changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html",
+ "changeStatus": "On branch developer-catch-merge\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.html\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts",
"changeAuthor": "peter.maquiran"
}
\ No newline at end of file