diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 198635280..ae509538d 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -205,13 +205,9 @@ export class EventsPage implements OnInit { let date = new Date(); let month = date.getMonth() + 1; - //date.setMonth(date.getMonth() + 1); let start = date.getFullYear() + "-" + month + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds(); let end = date.getFullYear() + "-" + month + "-" + date.getDate() + " 23:59:59"; - console.log('Data start yahaya', start) - console.log('Data end yahaya', end) - if (this.loggeduser.Profile == 'MDGPR') { let mdOficialEvents = await this.eventService.getAllMdOficialEvents(start, end).toPromise(); @@ -237,7 +233,6 @@ export class EventsPage implements OnInit { let prPessoalEvents = await this.eventService.getAllPrPessoalEvents(start, end).toPromise(); const list = prOficialEvents.concat(prPessoalEvents); - console.log("getAllPrOficialPessoalEvents", list) this.addEventToDb(list); if (list.length > 0) { this.currentEvent = list[0].Subject; @@ -251,96 +246,24 @@ export class EventsPage implements OnInit { } else { if(this.loggeduser.OwnerCalendars.length >= 1) { - console.log('OWN caledare') + let onwEvent:any = await this.eventService.getAllOwnEvents(start, end) this.listToPresent = onwEvent; this.totalEvent = onwEvent.length; this.showLoader = false; } else { - console.log('ELSE') + } - //if need share calendare - //this.eventService.genericGetAllSharedEvents - } - - /* switch (this.segment) - { - case "Combinada": - if(this.loggeduser.Profile == 'MDGPR'){ - - let mdOficialEvents = await this.eventService.getAllMdOficialEvents(start, end).toPromise(); - let mdPessoalEvents = await this.eventService.getAllMdPessoalEvents(start, end).toPromise(); - - this.eventsList = mdOficialEvents.concat(mdPessoalEvents); - - if(this.eventsList.length > 0){ - this.currentEvent = this.eventsList[0].Subject; - this.currentHoursMinutes = this.eventsList[0].StartDate; - } - - this.totalEvent = this.eventsList.length; - this.showLoader = false; - - } - else{ - - let prOficialEvents= await this.eventService.getAllPrOficialEvents(start, end).toPromise(); - let prPessoalEvents= await this.eventService.getAllPrPessoalEvents(start, end).toPromise(); - this.eventsList = prOficialEvents.concat(prPessoalEvents); - console.log(this.eventsList); - console.log(this.eventsList); - - if(this.eventsList.length > 0){ - this.currentEvent = this.eventsList[0].Subject; - this.currentHoursMinutes = this.eventsList[0].StartDate; - } - - this.totalEvent = this.eventsList.length; - this.showLoader = false; - - } - - break; - case "Pessoal": - if(this.loggeduser.Profile == 'MDGPR'){ - this.eventService.getAllMdPessoalEvents(start, end).subscribe(res => { - this.personaleventsList = res.filter(data => data.CalendarName == "Pessoal"); - this.showLoader = false; - }); - } - else{ - this.eventService.getAllPrPessoalEvents(start, end).subscribe(res => { - this.personaleventsList = res.filter(data => data.CalendarName == "Pessoal"); - this.showLoader = false; - }); - } - - break; - case "Oficial": - if(this.loggeduser.Profile == 'MDGPR'){ - this.eventService.getAllMdOficialEvents(start, end).subscribe(res => { - this.officialeventsList = res.filter(data => data.CalendarName == "Oficial");; - this.showLoader = false; - }); - } - else{ - this.eventService.getAllPrOficialEvents(start, end).subscribe(res => { - this.officialeventsList = res.filter(data => data.CalendarName == "Oficial");; - this.showLoader = false; - }); - } - break; - } */ } addEventToDb(list) { if (this.platform.is('desktop') || this.platform.is('mobileweb')) { this.storage.set('events', list).then(() => { - console.log('Init events saved') + // console.log('Init events saved') }) } else { if (list.length > 0) { @@ -374,7 +297,7 @@ export class EventsPage implements OnInit { } todayEvents.push(eventObject); }) - console.log('JIFJSOSDJSDONS',todayEvents) + }) }); } @@ -385,7 +308,7 @@ export class EventsPage implements OnInit { if (this.platform.is('desktop') || this.platform.is('mobileweb')) { this.storage.set('process', list).then(() => { - console.log('Init process saved') + // console.log('Init process saved') }) } else { if (list.length > 0) { @@ -402,20 +325,20 @@ export class EventsPage implements OnInit { let month = date.getMonth() + 1; //date.setMonth(date.getMonth() + 1); let dateToday = date.getFullYear() + "-" + month + "-" + date.getDate(); - console.log('dateeeeee', dateToday) + // ('dateeeeee', dateToday) if (this.platform.is('desktop') || this.platform.is('mobileweb')) { this.storage.get('events').then((events: any[]) => { - console.log('Today events',events) + // console.log('Today events',events) let todayEvents = new Array() this.listToPresent = events this.totalEvent = this.listToPresent.length this.currentEvent = this.listToPresent[0].Subject this.currentHoursMinutes = this.listToPresent[0].StartDate - console.log("All events from local,", events) + // console.log("All events from local,", events) }) this.storage.get('process').then((process: any[]) => { - console.log('OFOFOFOOF22222', process) + // console.log('OFOFOFOOF22222', process) const ExpedienteTask = process.map(e => this.expedienteTaskPipe.transform(e)) this.listToPresentexpediente = ExpedienteTask; }) @@ -449,7 +372,7 @@ export class EventsPage implements OnInit { Subject: element.Subject } let starteDate = momentG(new Date(element.StartDate), 'yyyy-MM-dd'); - console.log('startTOdayyy', starteDate) + // console.log('startTOdayyy', starteDate) if (dateToday == starteDate) { todayEvents.push(eventObject); } @@ -458,12 +381,12 @@ export class EventsPage implements OnInit { this.totalEvent = this.listToPresent.length this.currentEvent = this.listToPresent[0].Subject this.currentHoursMinutes = this.listToPresent[0].StartDate - console.log("All events from local,", event) + // console.log("All events from local,", event) }) this.sqliteservice.getprocessByworkflow("Expediente").then((process: any[]) => { - console.log('OFOFOFOOF', process) + // console.log('OFOFOFOOF', process) if (process.length > 0 || process != undefined) { @@ -485,7 +408,7 @@ export class EventsPage implements OnInit { } }) - console.log('OFOFOFOOF22222', expedientlist) + // console.log('OFOFOFOOF22222', expedientlist) const ExpedienteTask = expedientlist.map(e => this.expedienteTaskPipe.transform(e)) this.listToPresentexpediente = ExpedienteTask; @@ -517,12 +440,12 @@ export class EventsPage implements OnInit { changeProfile() { if (this.profile == "mdgpr") { - console.log('pr'); + // console.log('pr'); this.profile = "pr"; this.RefreshEvents(); } else { - console.log('mdgpr'); + // console.log('mdgpr'); this.profile = "mdgpr"; this.RefreshEvents(); } @@ -534,7 +457,7 @@ export class EventsPage implements OnInit { } async openEventDetail1(id: any) { - console.log(id); + // console.log(id); const modal = await this.modalController.create({ component: EventDetailPage, @@ -551,16 +474,18 @@ export class EventsPage implements OnInit { LoadList() { this.processes.GetTaskListExpediente(false).subscribe(result => { - console.log("Expediente", result); + // console.log("Expediente", result); this.addProcessToDb(result); const ExpedienteTask = result.map(e => this.expedienteTaskPipe.transform(e)) - console.log("Expediente 2", ExpedienteTask); - this.listToPresentexpediente = ExpedienteTask; + + this.showLoader = false; }, ((error) => { - console.log('Getlist error', error) + + this.showLoader = false; + // console.log('Getlist error', error) this.getEventsFromLocalDb(); })); } diff --git a/src/app/services/chat/ws-chat.service.ts b/src/app/services/chat/ws-chat.service.ts index 6323b1e1c..e48d82d06 100644 --- a/src/app/services/chat/ws-chat.service.ts +++ b/src/app/services/chat/ws-chat.service.ts @@ -54,7 +54,7 @@ export class WsChatService { } const requestId = uuidv4() - console.log('Login true', SessionStore.user) + // console.log('Login true', SessionStore.user) const message = { msg: "method", method: "login", @@ -70,12 +70,12 @@ export class WsChatService { return new Promise((resolve, reject) => { - console.log('MESSAGE:ID', requestId) + // console.log('MESSAGE:ID', requestId) this.ws.registerCallback({type:'Onmessage', funx:(message)=>{ - console.log('MESSAGE:ID', message) + // console.log('MESSAGE:ID', message) if(message.id == requestId ) { // same request send - console.log('MESSAGE:ID', message.id, requestId) - console.log('LOGIN WS',message) + // console.log('MESSAGE:ID', message.id, requestId) + // console.log('LOGIN WS',message) if(message.result) { if(message.result.token) { @@ -87,11 +87,11 @@ export class WsChatService { }, 10) resolve(message) - console.log('LOGIN WS',message) + // console.log('LOGIN WS',message) } } else { this.isLogin = false - console.log('Register FAIl', message) + // console.log('Register FAIl', message) reject(message) } @@ -121,7 +121,7 @@ export class WsChatService { this.ws.registerCallback({type:'Onmessage', funx:(message)=>{ if(message.id == requestId) { // same request send resolve(message) - console.log('getRooms', message) + // console.log('getRooms', message) return true } }}) @@ -206,7 +206,7 @@ export class WsChatService { }] } - console.log('send message to rocketchat ', message) + // console.log('send message to rocketchat ', message) this.ws.send({message, requestId}); @@ -312,7 +312,7 @@ export class WsChatService { this.ws.registerCallback({type:'Onmessage', funx:(message)=>{ if(message.id == requestId ) { // same request send resolve(message) - console.log(message); + // console.log(message); return true } @@ -738,7 +738,7 @@ export class WsChatService { this.wsMsgQueue[requestId] = {message, requestId, loginRequired} } else { let messageStr = JSON.stringify(message) - console.log('messageStr', messageStr) + // console.log('messageStr', messageStr) this.socket.send(messageStr) }