peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-18 20:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

undo changes on event page

Browse Source
This commit is contained in:
Eudes Inácio
2022-12-22 11:04:25 +01:00
parent 93bbe3f188 7168788b3c
commit 3d48c723f5
5 changed files with 194 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hooks/commit.js
+3
View File
@@ -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);
});
src/app/guards/login.guard.ts
+2 -2
View File
@@ -24,7 +24,7 @@ export class LoginGuard implements CanActivate {
// enter app // enter app
this.router.navigate(['/home/events']); this.router.navigate(['/home/events']);
return false 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 // login with password while has pin
SessionStore.forceToLoginWithForceToLogInWithPassword = false SessionStore.forceToLoginWithForceToLogInWithPassword = false
return true return true
@@ -32,7 +32,7 @@ export class LoginGuard implements CanActivate {
// go to pin page // go to pin page
this.router.navigate(['/pin']); this.router.navigate(['/pin']);
return false 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']); this.router.navigate(['/inactivity']);
return false return false
} else { } else {
src/app/pages/events/events.page.html
+1
View File
@@ -142,3 +142,4 @@
<!-- <iframe id="home-iframe" style="width: 100%;" src="/assets/www/pdfjs/web/viewer.html?file=/assets/www/pdfjs/web/compressed.tracemonkey-pldi-09.pdf.pdf"></iframe> --> <!-- <iframe id="home-iframe" style="width: 100%;" src="/assets/www/pdfjs/web/viewer.html?file=/assets/www/pdfjs/web/compressed.tracemonkey-pldi-09.pdf.pdf"></iframe> -->
</ion-content> </ion-content>
src/app/pages/events/events.page.ts
+187 -203
View File
@@ -5,7 +5,6 @@ import { ActivatedRoute, NavigationEnd } from '@angular/router';
import { ModalController, Platform } from '@ionic/angular'; import { ModalController, Platform } from '@ionic/angular';
import { EventDetailPage } from './event-detail/event-detail.page'; import { EventDetailPage } from './event-detail/event-detail.page';
import { ProcessesService } from '../../services/processes.service'; 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 { ToDayEventStorage } from 'src/app/store/to-day-event-storage.service';
import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe'; import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe';
import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service'; import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service';
@@ -62,7 +61,6 @@ export class EventsPage implements OnInit {
@Output() openExpedientListPage: EventEmitter<any> = new EventEmitter<any>(); @Output() openExpedientListPage: EventEmitter<any> = new EventEmitter<any>();
loggeduser: LoginUserRespose;
sessoStore = SessionStore; sessoStore = SessionStore;
showAgendaLoader = false showAgendaLoader = false
@@ -83,67 +81,58 @@ export class EventsPage implements OnInit {
private changeProfileService: ChangeProfileService, 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(() => {
//
//
}); // this.listToPresent = [];
// this.listToPresentexpediente = []
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 = []
})
} }
ngOnInit() { ngOnInit() {
this.showGreeting(); // this.showGreeting();
this.router.events.forEach((event) => { // this.router.events.forEach((event) => {
if (event instanceof NavigationEnd && event.url == '/home/events') { // if (event instanceof NavigationEnd && event.url == '/home/events') {
this.RefreshEvents(); // this.RefreshEvents();
setTimeout(() => { // setTimeout(() => {
this.LoadList(); // this.LoadList();
}, 1500) // }, 1500)
} // }
}); // });
this.hideSearch(); // this.hideSearch();
this.backgroundservice.registerBackService('Online', () => { // this.backgroundservice.registerBackService('Online', () => {
this.showGreeting(); // this.showGreeting();
this.RefreshEvents(); // this.RefreshEvents();
this.LoadList(); // this.LoadList();
this.hideSearch(); // this.hideSearch();
}); // });
} }
hideSearch() { hideSearch() {
if (this.router.url == '/home/events') { // if (this.router.url == '/home/events') {
this.hideSearchBtn = true; // this.hideSearchBtn = true;
} // }
} }
doRefresh() { doRefresh() {
this.RefreshEvents(); // this.RefreshEvents();
this.LoadList(); // this.LoadList();
} }
onSegmentChange() { onSegmentChange() {
this.doRefresh(); // this.doRefresh();
} }
@@ -175,177 +164,177 @@ export class EventsPage implements OnInit {
addEventToDb(list) { addEventToDb(list) {
if (this.platform.is('desktop') || this.platform.is('mobileweb')) { // if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
this.storage.set('events', list).then(() => { // this.storage.set('events', list).then(() => {
// // //
}) // })
} else { // } else {
if (list.length > 0) { // if (list.length > 0) {
list.forEach(element => { // list.forEach(element => {
this.sqliteservice.addEvent(element) // this.sqliteservice.addEvent(element)
this.sqliteservice.getAllEvents().then((event: any[] = []) => { // this.sqliteservice.getAllEvents().then((event: any[] = []) => {
let todayEvents = new Array() // let todayEvents = new Array()
event.forEach((element) => { // event.forEach((element) => {
let eventObject = { // let eventObject = {
AppointmentState: element.AppointmentState, // AppointmentState: element.AppointmentState,
Attachments: element.Attachments, // Attachments: element.Attachments,
Attendees: element.Attendees, // Attendees: element.Attendees,
CalendarId: element.CalendarId, // CalendarId: element.CalendarId,
CalendarName: element.CalendarName, // CalendarName: element.CalendarName,
Category: element.Category, // Category: element.Category,
EndDate: element.EndDate, // EndDate: element.EndDate,
EventId: element.EventId, // EventId: element.EventId,
EventRecurrence: element.EventRecurrence, // EventRecurrence: element.EventRecurrence,
EventType: element.EventType, // EventType: element.EventType,
HasAttachments: element.HasAttachments, // HasAttachments: element.HasAttachments,
HumanDate: element.HumanDate, // HumanDate: element.HumanDate,
IsAllDayEvent: element.IsAllDayEvent, // IsAllDayEvent: element.IsAllDayEvent,
IsMeeting: element.IsMeeting, // IsMeeting: element.IsMeeting,
IsRecurring: element.IsRecurring, // IsRecurring: element.IsRecurring,
Location: element.Location, // Location: element.Location,
Organizer: element.Organizer, // Organizer: element.Organizer,
Profile: element.Profile, // Profile: element.Profile,
StartDate: element.StartDate, // StartDate: element.StartDate,
Subject: element.Subject // Subject: element.Subject
} // }
todayEvents.push(eventObject); // todayEvents.push(eventObject);
}) // })
}) // })
}); // });
} // }
} // }
} }
addProcessToDb(list) { addProcessToDb(list) {
if (this.platform.is('desktop') || this.platform.is('mobileweb')) { // if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
this.storage.set('process', list).then(() => { // this.storage.set('process', list).then(() => {
// // //
}) // })
} else { // } else {
if (list.length > 0) { // if (list.length > 0) {
list.forEach(element => { // list.forEach(element => {
this.sqliteservice.addProcess(element) // this.sqliteservice.addProcess(element)
}); // });
} // }
} // }
} }
getEventsFromLocalDb() { getEventsFromLocalDb() {
let date = new Date(); // let date = new Date();
let month = date.getMonth() + 1; // let month = date.getMonth() + 1;
//date.setMonth(date.getMonth() + 1); // //date.setMonth(date.getMonth() + 1);
let dateToday = date.getFullYear() + "-" + month + "-" + date.getDate(); // let dateToday = date.getFullYear() + "-" + month + "-" + date.getDate();
// ('dateeeeee', dateToday) // // ('dateeeeee', dateToday)
if (this.platform.is('desktop') || this.platform.is('mobileweb')) { // if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
this.storage.get('events').then((events: any[] = []) => { // this.storage.get('events').then((events: any[] = []) => {
// // //
let todayEvents = new Array() // let todayEvents = new Array()
this.listToPresent = events // this.listToPresent = events
this.totalEvent = this.listToPresent.length // this.totalEvent = this.listToPresent.length
this.currentEvent = this.listToPresent[0].Subject // this.currentEvent = this.listToPresent[0].Subject
this.currentHoursMinutes = this.listToPresent[0].StartDate // this.currentHoursMinutes = this.listToPresent[0].StartDate
// // //
}) // })
this.storage.get('process').then((process: any[] = []) => { // this.storage.get('process').then((process: any[] = []) => {
// // //
const ExpedienteTask = process.map(e => this.expedienteTaskPipe.transform(e)) // const ExpedienteTask = process.map(e => this.expedienteTaskPipe.transform(e))
this.listToPresentexpediente = ExpedienteTask; // this.listToPresentexpediente = ExpedienteTask;
}) // })
this.showLoader = false; // this.showLoader = false;
} else { // } else {
this.sqliteservice.getAllEvents().then((event: any[] = []) => { // this.sqliteservice.getAllEvents().then((event: any[] = []) => {
let todayEvents = new Array() // let todayEvents = new Array()
event.forEach((element) => { // event.forEach((element) => {
let eventObject = { // let eventObject = {
AppointmentState: element.AppointmentState, // AppointmentState: element.AppointmentState,
Attachments: element.Attachments, // Attachments: element.Attachments,
Attendees: element.Attendees, // Attendees: element.Attendees,
CalendarId: element.CalendarId, // CalendarId: element.CalendarId,
CalendarName: element.CalendarName, // CalendarName: element.CalendarName,
Category: element.Category, // Category: element.Category,
EndDate: element.EndDate, // EndDate: element.EndDate,
EventId: element.EventId, // EventId: element.EventId,
EventRecurrence: element.EventRecurrence, // EventRecurrence: element.EventRecurrence,
EventType: element.EventType, // EventType: element.EventType,
HasAttachments: element.HasAttachments, // HasAttachments: element.HasAttachments,
HumanDate: element.HumanDate, // HumanDate: element.HumanDate,
IsAllDayEvent: element.IsAllDayEvent, // IsAllDayEvent: element.IsAllDayEvent,
IsMeeting: element.IsMeeting, // IsMeeting: element.IsMeeting,
IsRecurring: element.IsRecurring, // IsRecurring: element.IsRecurring,
Location: element.Location, // Location: element.Location,
Organizer: element.Organizer, // Organizer: element.Organizer,
Profile: element.Profile, // Profile: element.Profile,
StartDate: element.StartDate, // StartDate: element.StartDate,
Subject: element.Subject // Subject: element.Subject
} // }
let starteDate = momentG(new Date(element.StartDate), 'yyyy-MM-dd'); // let starteDate = momentG(new Date(element.StartDate), 'yyyy-MM-dd');
// // //
if (dateToday == starteDate) { // if (dateToday == starteDate) {
todayEvents.push(eventObject); // todayEvents.push(eventObject);
} // }
}) // })
this.listToPresent = todayEvents // this.listToPresent = todayEvents
this.totalEvent = this.listToPresent.length // this.totalEvent = this.listToPresent.length
this.currentEvent = this.listToPresent[0].Subject // this.currentEvent = this.listToPresent[0].Subject
this.currentHoursMinutes = this.listToPresent[0].StartDate // 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(); // var expedientlist: any = new Array();
process.forEach((element) => { // process.forEach((element) => {
if(JSON.parse(element.workflowInstanceDataFields).TaskMessage || JSON.parse(element.workflowInstanceDataFields).Note) { // if(JSON.parse(element.workflowInstanceDataFields).TaskMessage || JSON.parse(element.workflowInstanceDataFields).Note) {
let task = { // let task = {
activityInstanceName: element.activityInstanceName, // activityInstanceName: element.activityInstanceName,
deadline: null, // deadline: null,
serialNumber: element.serialNumber, // serialNumber: element.serialNumber,
taskStartDate: element.taskStartDate, // taskStartDate: element.taskStartDate,
totalDocuments: element.totalDocuments, // totalDocuments: element.totalDocuments,
workflowDisplayName: element.workflowDisplayName, // workflowDisplayName: element.workflowDisplayName,
workflowInstanceDataFields: JSON.parse(element.workflowInstanceDataFields) // workflowInstanceDataFields: JSON.parse(element.workflowInstanceDataFields)
} // }
expedientlist.push(task); // expedientlist.push(task);
} // }
}) // })
// // //
const ExpedienteTask = expedientlist.map(e => this.expedienteTaskPipe.transform(e)) // const ExpedienteTask = expedientlist.map(e => this.expedienteTaskPipe.transform(e))
this.listToPresentexpediente = ExpedienteTask; // this.listToPresentexpediente = ExpedienteTask;
} // }
this.showLoader = false; // this.showLoader = false;
}) // })
} // }
// }); // // });
} }
showGreeting() { showGreeting() {
if (this.today.getHours() >= 6 && this.today.getHours() < 12) { // if (this.today.getHours() >= 6 && this.today.getHours() < 12) {
this.greetting = this.grettings[0]; // this.greetting = this.grettings[0];
} // }
else if (this.today.getHours() >= 12 && this.today.getHours() < 18) { // else if (this.today.getHours() >= 12 && this.today.getHours() < 18) {
this.greetting = this.grettings[1]; // this.greetting = this.grettings[1];
} // }
else /* if(this.today.getHours() < 6 && this.today.getHours() >= 18) */ { // else /* if(this.today.getHours() < 6 && this.today.getHours() >= 18) */ {
this.greetting = this.grettings[2]; // this.greetting = this.grettings[2];
} // }
} }
gotTo() { gotTo() {
@@ -353,21 +342,16 @@ export class EventsPage implements OnInit {
} }
changeProfile() { changeProfile() {
if (this.profile == "mdgpr") { // if (this.profile == "mdgpr") {
// // //
this.profile = "pr"; // this.profile = "pr";
this.RefreshEvents(); // this.RefreshEvents();
} // }
else { // else {
// // //
this.profile = "mdgpr"; // this.profile = "mdgpr";
this.RefreshEvents(); // this.RefreshEvents();
} // }
}
logout() {
SessionStore.user.BasicAuthKey = "";
this.router.navigate(['/home/login']);
} }
async openEventDetail1(id: any) { async openEventDetail1(id: any) {
@@ -439,7 +423,7 @@ export class EventsPage implements OnInit {
viewExpedientListPage() { viewExpedientListPage() {
if (this.loggeduser.Profile == 'PR') { if (this.sessoStore.user.Profile == 'PR') {
if (window.innerWidth < 701) { if (window.innerWidth < 701) {
this.router.navigate(['/home/gabinete-digital/expedientes-pr']); this.router.navigate(['/home/gabinete-digital/expedientes-pr']);
} }
src/app/pages/login/login.page.ts
+1 -4
View File
@@ -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 { ChatSystemService } from 'src/app/services/chat/chat-system.service';
import { ChatService } from 'src/app/services/chat.service'; import { ChatService } from 'src/app/services/chat.service';
import { Platform } from '@ionic/angular'; import { Platform } from '@ionic/angular';
import { SqliteService } from 'src/app/services/sqlite.service';
@Component({ @Component({
@@ -54,7 +52,6 @@ export class LoginPage implements OnInit {
public ChatSystemService: ChatSystemService, public ChatSystemService: ChatSystemService,
private ChatService: ChatService, private ChatService: ChatService,
private platform: Platform, private platform: Platform,
private sqliteservice: SqliteService,
) {} ) {}
ngOnInit() { ngOnInit() {
@@ -172,7 +169,7 @@ export class LoginPage implements OnInit {
} }
} else { } else {
this.router.navigateByUrl('/home/events'); this.router.navigate(['/home/events']);
} }