diff --git a/src/app/Rules/aprove-event.service.ts b/src/app/Rules/aprove-event.service.ts
index 40e6f7de2..2e860a1ea 100644
--- a/src/app/Rules/aprove-event.service.ts
+++ b/src/app/Rules/aprove-event.service.ts
@@ -26,7 +26,7 @@ export class AproveEventService {
let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise();
let eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal);
- eventsMDGPRList = eventsMDGPRList.filter((item) => item.activityInstanceName != 'Editar Evento')
+ // eventsMDGPRList = eventsMDGPRList.filter((item) => item.activityInstanceName != 'Editar Evento')
this.loader.pop()
return eventsMDGPRList
} catch (error) {
@@ -40,7 +40,7 @@ export class AproveEventService {
try {
let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR,Agenda Pessoal PR', false).toPromise();
let eventsPRList = prEventsOficial
- eventsPRList = eventsPRList.filter((item) => item.activityInstanceName != 'Editar Evento')
+ // eventsPRList = eventsPRList.filter((item) => item.activityInstanceName != 'Editar Evento')
return eventsPRList;
} catch (error) {
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 fd8294ba2..748e38f07 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.html
+++ b/src/app/pages/chat/group-messages/group-messages.page.html
@@ -92,11 +92,8 @@
{{"Imagem"}}
-
-
-
-
-
+
+
@@ -140,11 +137,8 @@
{{"Mensagem de voz"}}
-
-
-
-
-
+
+
diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html
index 2a6e6dc2e..ae9c05f13 100644
--- a/src/app/pages/chat/messages/messages.page.html
+++ b/src/app/pages/chat/messages/messages.page.html
@@ -88,11 +88,8 @@
{{"Imagem"}}
-
-
-
-
-
+
+
@@ -144,11 +141,8 @@
{{"Mensagem de voz"}}
-
-
-
-
-
+
+
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 8dc258889..737129ea5 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
@@ -27,7 +27,7 @@ export class EventListPage implements OnInit {
// [desktop] event list to approve
profile: string;
- segment: string;
+ segment: any;
showLoader: boolean;
eventsPRList: any = [];
eventsMDGPRList: any = [];
@@ -183,8 +183,8 @@ export class EventListPage implements OnInit {
} else {
this.color = 'pr'
-
- let allEvents = await this.processes.eventsToApprove(segment,'mobile agenda').toPromise()
+ console.log('segment.OwnerUserId1111', segment.OwnerUserId)
+ let allEvents = await this.processes.eventsToApprove(segment.OwnerUserId,'mobile agenda').toPromise()
try {
this.eventsList = this.sortService.sortArrayByDate(allEvents).reverse();
} catch(error) {
@@ -194,7 +194,7 @@ export class EventListPage implements OnInit {
this.eventsList = this.eventsList
this.eventsList = this.eventsList
this.showLoader = false;
- this.eventoaprovacaostore.save(segment, this.eventsList)
+ this.eventoaprovacaostore.save(segment.OwnerUserId, this.eventsList)
}
this.showLoader = false;
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 4881dc570..ea9ec0246 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -781,7 +781,7 @@ export class GabineteDigitalPage implements OnInit {
this.eventoaprovacaostore.save(calendar, eventsList)
} else {
-
+ console.log('segment.OwnerUserId6666666666', calendar.OwnerUserId)
let allEvents = await this.processesbackend.eventsToApprove(calendar.OwnerUserId, 'againete page').toPromise()
let eventsList
try {
@@ -790,7 +790,7 @@ export class GabineteDigitalPage implements OnInit {
eventsList = []
}
- this.eventoaprovacaostore.save(calendar, eventsList)
+ this.eventoaprovacaostore.save(calendar.OwnerUserId, eventsList)
}
}
// let mdEventsOficial = await this.processesbackend.GetTasksList('Agenda Oficial MDGPR,Agenda Pessoal MDGPR', false).toPromise();
diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts
index 6e3f2d6d4..64f9c74b7 100644
--- a/src/app/services/events.service.ts
+++ b/src/app/services/events.service.ts
@@ -50,6 +50,7 @@ export class EventsService {
calendarNames = {}
calendarNamesAry = []
+
calendarNamesType = {}
calendarRole = []
calendrFullName = []
diff --git a/src/app/shared/agenda/event-list/event-list.page.ts b/src/app/shared/agenda/event-list/event-list.page.ts
index 859448698..7eb6dffa7 100644
--- a/src/app/shared/agenda/event-list/event-list.page.ts
+++ b/src/app/shared/agenda/event-list/event-list.page.ts
@@ -81,7 +81,7 @@ export class EventListPage implements OnInit {
async LoadToApproveEvents() {
this.showLoader = true;
- const segment = this.segment
+ const segment: any = this.segment
if(this.segment == 'Meu calendario') {
// color
@@ -103,7 +103,6 @@ export class EventListPage implements OnInit {
} else {
this.color = 'pr'
-
let allEvents = await this.processes.eventsToApprove(segment,'agenda desktop').toPromise()
try {
this.eventsList = this.sortService.sortArrayByDate(allEvents).reverse();
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 7e4203b16..c3d3ac1a7 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -92,11 +92,8 @@
{{"Imagem"}}
-
-
-
-
-
+
+
@@ -146,11 +143,8 @@
{{"Mensagem de voz"}}
-
-
-
-
-
+
+
diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html
index 061b474ce..230782d51 100644
--- a/src/app/shared/chat/messages/messages.page.html
+++ b/src/app/shared/chat/messages/messages.page.html
@@ -94,11 +94,9 @@
{{"Imagem"}}
-
-
-
-
-
+
+
+
@@ -154,11 +152,9 @@
{{'Mensagem de voz'}}
-
-
-
-
- s
+
+
+
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 377f490bf..3b512ae84 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
@@ -27,7 +27,7 @@ export class EventsToApprovePage implements OnInit {
eventBody: EventBody;
categories: string[];
serialnumber:string;
- segment:string;
+ segment:any;
eventaprovacaostore = EventoAprovacaoStore;
eventsList: any = []
@@ -93,26 +93,18 @@ export class EventsToApprovePage implements OnInit {
this.eventsList = [];
}
- this.eventsList = this.eventsList.filter(function(item) {
- return item.activityInstanceName != 'Editar Evento'
- }) || []
-
this.eventoaprovacaostore.save(segment, this.eventsList)
} else {
this.color = 'pr'
-
+ console.log('segment.OwnerUserId22222', segment)
let allEvents = await this.processes.eventsToApprove(segment, 'gabinete').toPromise()
try {
this.eventsList = this.sortService.sortArrayByDate(allEvents).reverse();
} catch(error) {
this.eventsList = []
}
-
- this.eventsList = this.eventsList.filter(function(item) {
- return item.activityInstanceName != 'Editar Evento'
- }) || []
this.eventsList = this.eventsList
this.eventsList = this.eventsList
diff --git a/src/app/store/eventoaprovacao-store.service.ts b/src/app/store/eventoaprovacao-store.service.ts
index c31192920..b67f6f321 100644
--- a/src/app/store/eventoaprovacao-store.service.ts
+++ b/src/app/store/eventoaprovacao-store.service.ts
@@ -23,7 +23,7 @@ export class EventoaprovacaoStoreService {
this.keyNameAll = (SHA1("EventoaprovacaoStoreService"+"all")).toString()
- setTimeout(()=>{
+ setTimeout(() => {
let {list , counts} = localstoreService.get(this.keyNameAll, {})
this._list = list || {}
@@ -42,7 +42,11 @@ export class EventoaprovacaoStoreService {
}
- save(segment, value: []) {
+ save(segment: string, value: []) {
+
+ if(typeof segment == 'object') {
+ throw("segment most be userId")
+ }
if(!this._list[segment]) {
this._list[segment] = []
diff --git a/version/git-version.ts b/version/git-version.ts
index d1a55dbc8..bf85fe732 100644
--- a/version/git-version.ts
+++ b/version/git-version.ts
@@ -1,12 +1,12 @@
export let versionData = {
- "shortSHA": "c825fb2d3",
- "SHA": "c825fb2d3c654f90054b48f29c2c4e576daa15da",
+ "shortSHA": "ced8320dd",
+ "SHA": "ced8320dd2f685af479beddc331a6bce503efc5a",
"branch": "no_bug_movemente",
"lastCommitAuthor": "'Peter Maquiran'",
- "lastCommitTime": "'Tue Mar 14 09:50:40 2023 +0100'",
- "lastCommitMessage": "fix chat camera",
- "lastCommitNumber": "4869",
+ "lastCommitTime": "'Tue Mar 14 09:56:48 2023 +0100'",
+ "lastCommitMessage": "fix take picture",
+ "lastCommitNumber": "4870",
"change": "",
- "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/chat/messages/messages.page.ts",
+ "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/Rules/aprove-event.service.ts\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/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/services/events.service.ts\n\tmodified: src/app/shared/agenda/event-list/event-list.page.ts\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/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified: src/app/store/eventoaprovacao-store.service.ts",
"changeAuthor": "peter.maquiran"
}
\ No newline at end of file