diff --git a/hooks/commit.js b/hooks/commit.js new file mode 100644 index 000000000..602749d01 --- /dev/null +++ b/hooks/commit.js @@ -0,0 +1,3 @@ +require('child_process').exec('git rev-parse HEAD', function(err, stdout) { + console.log('Last commit hash on this branch is:', stdout); +}); \ No newline at end of file diff --git a/src/app/guards/login.guard.ts b/src/app/guards/login.guard.ts index b74d01a34..bb3dcb319 100644 --- a/src/app/guards/login.guard.ts +++ b/src/app/guards/login.guard.ts @@ -24,7 +24,7 @@ export class LoginGuard implements CanActivate { // enter app this.router.navigate(['/home/events']); return false - } else if(SessionStore.exist && !SessionStore.user.Inactivity && SessionStore.user.LoginPreference == 'Pin' && SessionStore.forceToLoginWithForceToLogInWithPassword && !this.platform.is('desktop') && !this.platform.is('mobileweb')) { + } else if(SessionStore.exist && !SessionStore.user.Inactivity && SessionStore.user.LoginPreference == 'Pin' && SessionStore.forceToLoginWithForceToLogInWithPassword && this.platform.is('mobile')) { // login with password while has pin SessionStore.forceToLoginWithForceToLogInWithPassword = false return true @@ -32,7 +32,7 @@ export class LoginGuard implements CanActivate { // go to pin page this.router.navigate(['/pin']); return false - } else if(SessionStore.exist && !SessionStore.user.Inactivity && SessionStore.user.LoginPreference == 'Pin' && !this.platform.is('desktop') && !this.platform.is('mobileweb')) { + } else if(SessionStore.exist && !SessionStore.user.Inactivity && SessionStore.user.LoginPreference == 'Pin' && this.platform.is('mobile')) { this.router.navigate(['/inactivity']); return false } else { diff --git a/src/app/pages/events/events.page.html b/src/app/pages/events/events.page.html index c30dbed7f..f74da62f6 100644 --- a/src/app/pages/events/events.page.html +++ b/src/app/pages/events/events.page.html @@ -142,3 +142,4 @@ + diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 13184b805..92769a9e4 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -5,7 +5,6 @@ import { ActivatedRoute, NavigationEnd } from '@angular/router'; import { ModalController, Platform } from '@ionic/angular'; import { EventDetailPage } from './event-detail/event-detail.page'; import { ProcessesService } from '../../services/processes.service'; -import { LoginUserRespose } from 'src/app/models/user.model'; import { ToDayEventStorage } from 'src/app/store/to-day-event-storage.service'; import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe'; import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service'; @@ -62,7 +61,6 @@ export class EventsPage implements OnInit { @Output() openExpedientListPage: EventEmitter = new EventEmitter(); - loggeduser: LoginUserRespose; sessoStore = SessionStore; showAgendaLoader = false @@ -83,67 +81,58 @@ export class EventsPage implements OnInit { private changeProfileService: ChangeProfileService, ) { - this.loggeduser = SessionStore.user; + // window['zipPhoneCallback'] = function (zipphone) { + // var frame = document.getElementById('home-iframe'); + // if(frame) { + // frame['contentWindow']['postMessage']({call:'cookies', value: { cookies: {} }}); + // } + // } - this.platform.resize.subscribe(async () => { - // - // + // this.changeProfileService.registerCallback(() => { - }); - - window['zipPhoneCallback'] = function (zipphone) { - var frame = document.getElementById('home-iframe'); - if(frame) { - frame['contentWindow']['postMessage']({call:'cookies', value: { cookies: {} }}); - } - } - - - this.changeProfileService.registerCallback(() => { - - this.listToPresent = []; - this.listToPresentexpediente = [] - }) + // this.listToPresent = []; + // this.listToPresentexpediente = [] + // }) } ngOnInit() { - this.showGreeting(); + // this.showGreeting(); - this.router.events.forEach((event) => { - if (event instanceof NavigationEnd && event.url == '/home/events') { - this.RefreshEvents(); - setTimeout(() => { - this.LoadList(); - }, 1500) - } - }); - this.hideSearch(); + // this.router.events.forEach((event) => { + // if (event instanceof NavigationEnd && event.url == '/home/events') { + // this.RefreshEvents(); + // setTimeout(() => { + // this.LoadList(); + // }, 1500) + // } + // }); + // this.hideSearch(); - this.backgroundservice.registerBackService('Online', () => { - this.showGreeting(); - this.RefreshEvents(); - this.LoadList(); - this.hideSearch(); - }); + // this.backgroundservice.registerBackService('Online', () => { + // this.showGreeting(); + // this.RefreshEvents(); + // this.LoadList(); + // this.hideSearch(); + // }); } hideSearch() { - if (this.router.url == '/home/events') { - this.hideSearchBtn = true; - } + // if (this.router.url == '/home/events') { + // this.hideSearchBtn = true; + // } } doRefresh() { - this.RefreshEvents(); - this.LoadList(); + // this.RefreshEvents(); + // this.LoadList(); } onSegmentChange() { - this.doRefresh(); + // this.doRefresh(); } @@ -175,177 +164,177 @@ export class EventsPage implements OnInit { addEventToDb(list) { - if (this.platform.is('desktop') || this.platform.is('mobileweb')) { - this.storage.set('events', list).then(() => { - // - }) - } else { - if (list.length > 0) { - list.forEach(element => { - this.sqliteservice.addEvent(element) + // if (this.platform.is('desktop') || this.platform.is('mobileweb')) { + // this.storage.set('events', list).then(() => { + // // + // }) + // } else { + // if (list.length > 0) { + // list.forEach(element => { + // this.sqliteservice.addEvent(element) - this.sqliteservice.getAllEvents().then((event: any[] = []) => { - let todayEvents = new Array() - event.forEach((element) => { - let eventObject = { - AppointmentState: element.AppointmentState, - Attachments: element.Attachments, - Attendees: element.Attendees, - CalendarId: element.CalendarId, - CalendarName: element.CalendarName, - Category: element.Category, - EndDate: element.EndDate, - EventId: element.EventId, - EventRecurrence: element.EventRecurrence, - EventType: element.EventType, - HasAttachments: element.HasAttachments, - HumanDate: element.HumanDate, - IsAllDayEvent: element.IsAllDayEvent, - IsMeeting: element.IsMeeting, - IsRecurring: element.IsRecurring, - Location: element.Location, - Organizer: element.Organizer, - Profile: element.Profile, - StartDate: element.StartDate, - Subject: element.Subject - } - todayEvents.push(eventObject); - }) + // this.sqliteservice.getAllEvents().then((event: any[] = []) => { + // let todayEvents = new Array() + // event.forEach((element) => { + // let eventObject = { + // AppointmentState: element.AppointmentState, + // Attachments: element.Attachments, + // Attendees: element.Attendees, + // CalendarId: element.CalendarId, + // CalendarName: element.CalendarName, + // Category: element.Category, + // EndDate: element.EndDate, + // EventId: element.EventId, + // EventRecurrence: element.EventRecurrence, + // EventType: element.EventType, + // HasAttachments: element.HasAttachments, + // HumanDate: element.HumanDate, + // IsAllDayEvent: element.IsAllDayEvent, + // IsMeeting: element.IsMeeting, + // IsRecurring: element.IsRecurring, + // Location: element.Location, + // Organizer: element.Organizer, + // Profile: element.Profile, + // StartDate: element.StartDate, + // Subject: element.Subject + // } + // todayEvents.push(eventObject); + // }) - }) - }); - } - } + // }) + // }); + // } + // } } addProcessToDb(list) { - if (this.platform.is('desktop') || this.platform.is('mobileweb')) { - this.storage.set('process', list).then(() => { - // - }) - } else { - if (list.length > 0) { - list.forEach(element => { - this.sqliteservice.addProcess(element) - }); - } - } + // if (this.platform.is('desktop') || this.platform.is('mobileweb')) { + // this.storage.set('process', list).then(() => { + // // + // }) + // } else { + // if (list.length > 0) { + // list.forEach(element => { + // this.sqliteservice.addProcess(element) + // }); + // } + // } } getEventsFromLocalDb() { - let date = new Date(); - let month = date.getMonth() + 1; - //date.setMonth(date.getMonth() + 1); - let dateToday = date.getFullYear() + "-" + month + "-" + date.getDate(); - // ('dateeeeee', dateToday) - if (this.platform.is('desktop') || this.platform.is('mobileweb')) { - this.storage.get('events').then((events: any[] = []) => { - // - let todayEvents = new Array() - this.listToPresent = events - this.totalEvent = this.listToPresent.length - this.currentEvent = this.listToPresent[0].Subject - this.currentHoursMinutes = this.listToPresent[0].StartDate - // - }) + // let date = new Date(); + // let month = date.getMonth() + 1; + // //date.setMonth(date.getMonth() + 1); + // let dateToday = date.getFullYear() + "-" + month + "-" + date.getDate(); + // // ('dateeeeee', dateToday) + // if (this.platform.is('desktop') || this.platform.is('mobileweb')) { + // this.storage.get('events').then((events: any[] = []) => { + // // + // let todayEvents = new Array() + // this.listToPresent = events + // this.totalEvent = this.listToPresent.length + // this.currentEvent = this.listToPresent[0].Subject + // this.currentHoursMinutes = this.listToPresent[0].StartDate + // // + // }) - this.storage.get('process').then((process: any[] = []) => { - // - const ExpedienteTask = process.map(e => this.expedienteTaskPipe.transform(e)) - this.listToPresentexpediente = ExpedienteTask; - }) + // this.storage.get('process').then((process: any[] = []) => { + // // + // const ExpedienteTask = process.map(e => this.expedienteTaskPipe.transform(e)) + // this.listToPresentexpediente = ExpedienteTask; + // }) - this.showLoader = false; + // this.showLoader = false; - } else { - this.sqliteservice.getAllEvents().then((event: any[] = []) => { - let todayEvents = new Array() - event.forEach((element) => { - let eventObject = { - AppointmentState: element.AppointmentState, - Attachments: element.Attachments, - Attendees: element.Attendees, - CalendarId: element.CalendarId, - CalendarName: element.CalendarName, - Category: element.Category, - EndDate: element.EndDate, - EventId: element.EventId, - EventRecurrence: element.EventRecurrence, - EventType: element.EventType, - HasAttachments: element.HasAttachments, - HumanDate: element.HumanDate, - IsAllDayEvent: element.IsAllDayEvent, - IsMeeting: element.IsMeeting, - IsRecurring: element.IsRecurring, - Location: element.Location, - Organizer: element.Organizer, - Profile: element.Profile, - StartDate: element.StartDate, - Subject: element.Subject - } - let starteDate = momentG(new Date(element.StartDate), 'yyyy-MM-dd'); - // - if (dateToday == starteDate) { - todayEvents.push(eventObject); - } - }) - this.listToPresent = todayEvents - this.totalEvent = this.listToPresent.length - this.currentEvent = this.listToPresent[0].Subject - this.currentHoursMinutes = this.listToPresent[0].StartDate - // - }) + // } else { + // this.sqliteservice.getAllEvents().then((event: any[] = []) => { + // let todayEvents = new Array() + // event.forEach((element) => { + // let eventObject = { + // AppointmentState: element.AppointmentState, + // Attachments: element.Attachments, + // Attendees: element.Attendees, + // CalendarId: element.CalendarId, + // CalendarName: element.CalendarName, + // Category: element.Category, + // EndDate: element.EndDate, + // EventId: element.EventId, + // EventRecurrence: element.EventRecurrence, + // EventType: element.EventType, + // HasAttachments: element.HasAttachments, + // HumanDate: element.HumanDate, + // IsAllDayEvent: element.IsAllDayEvent, + // IsMeeting: element.IsMeeting, + // IsRecurring: element.IsRecurring, + // Location: element.Location, + // Organizer: element.Organizer, + // Profile: element.Profile, + // StartDate: element.StartDate, + // Subject: element.Subject + // } + // let starteDate = momentG(new Date(element.StartDate), 'yyyy-MM-dd'); + // // + // if (dateToday == starteDate) { + // todayEvents.push(eventObject); + // } + // }) + // this.listToPresent = todayEvents + // this.totalEvent = this.listToPresent.length + // this.currentEvent = this.listToPresent[0].Subject + // this.currentHoursMinutes = this.listToPresent[0].StartDate + // // + // }) - this.sqliteservice.getprocessByworkflow("Expediente").then((process: any[] = []) => { + // this.sqliteservice.getprocessByworkflow("Expediente").then((process: any[] = []) => { - // + // // - if (process.length > 0 || process != undefined) { + // if (process.length > 0 || process != undefined) { - var expedientlist: any = new Array(); - process.forEach((element) => { - if(JSON.parse(element.workflowInstanceDataFields).TaskMessage || JSON.parse(element.workflowInstanceDataFields).Note) { + // var expedientlist: any = new Array(); + // process.forEach((element) => { + // if(JSON.parse(element.workflowInstanceDataFields).TaskMessage || JSON.parse(element.workflowInstanceDataFields).Note) { - let task = { - activityInstanceName: element.activityInstanceName, - deadline: null, - serialNumber: element.serialNumber, - taskStartDate: element.taskStartDate, - totalDocuments: element.totalDocuments, - workflowDisplayName: element.workflowDisplayName, - workflowInstanceDataFields: JSON.parse(element.workflowInstanceDataFields) - } - expedientlist.push(task); + // let task = { + // activityInstanceName: element.activityInstanceName, + // deadline: null, + // serialNumber: element.serialNumber, + // taskStartDate: element.taskStartDate, + // totalDocuments: element.totalDocuments, + // workflowDisplayName: element.workflowDisplayName, + // workflowInstanceDataFields: JSON.parse(element.workflowInstanceDataFields) + // } + // expedientlist.push(task); - } - }) + // } + // }) - // - const ExpedienteTask = expedientlist.map(e => this.expedienteTaskPipe.transform(e)) - this.listToPresentexpediente = ExpedienteTask; + // // + // const ExpedienteTask = expedientlist.map(e => this.expedienteTaskPipe.transform(e)) + // this.listToPresentexpediente = ExpedienteTask; - } + // } - this.showLoader = false; - }) - } - // }); + // this.showLoader = false; + // }) + // } + // // }); } showGreeting() { - if (this.today.getHours() >= 6 && this.today.getHours() < 12) { - this.greetting = this.grettings[0]; - } - else if (this.today.getHours() >= 12 && this.today.getHours() < 18) { - this.greetting = this.grettings[1]; - } - else /* if(this.today.getHours() < 6 && this.today.getHours() >= 18) */ { - this.greetting = this.grettings[2]; - } + // if (this.today.getHours() >= 6 && this.today.getHours() < 12) { + // this.greetting = this.grettings[0]; + // } + // else if (this.today.getHours() >= 12 && this.today.getHours() < 18) { + // this.greetting = this.grettings[1]; + // } + // else /* if(this.today.getHours() < 6 && this.today.getHours() >= 18) */ { + // this.greetting = this.grettings[2]; + // } } gotTo() { @@ -353,21 +342,16 @@ export class EventsPage implements OnInit { } changeProfile() { - if (this.profile == "mdgpr") { - // - this.profile = "pr"; - this.RefreshEvents(); - } - else { - // - this.profile = "mdgpr"; - this.RefreshEvents(); - } - } - - logout() { - SessionStore.user.BasicAuthKey = ""; - this.router.navigate(['/home/login']); + // if (this.profile == "mdgpr") { + // // + // this.profile = "pr"; + // this.RefreshEvents(); + // } + // else { + // // + // this.profile = "mdgpr"; + // this.RefreshEvents(); + // } } async openEventDetail1(id: any) { @@ -439,7 +423,7 @@ export class EventsPage implements OnInit { viewExpedientListPage() { - if (this.loggeduser.Profile == 'PR') { + if (this.sessoStore.user.Profile == 'PR') { if (window.innerWidth < 701) { this.router.navigate(['/home/gabinete-digital/expedientes-pr']); } diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index aac4b27aa..acdf23f28 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -16,8 +16,6 @@ import { RochetChatConnectorService } from 'src/app/services/chat/rochet-chat-co import { ChatSystemService } from 'src/app/services/chat/chat-system.service'; import { ChatService } from 'src/app/services/chat.service'; import { Platform } from '@ionic/angular'; -import { SqliteService } from 'src/app/services/sqlite.service'; - @Component({ @@ -54,7 +52,6 @@ export class LoginPage implements OnInit { public ChatSystemService: ChatSystemService, private ChatService: ChatService, private platform: Platform, - private sqliteservice: SqliteService, ) {} ngOnInit() { @@ -172,7 +169,7 @@ export class LoginPage implements OnInit { } } else { - this.router.navigateByUrl('/home/events'); + this.router.navigate(['/home/events']); }