mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-18 20:47:54 +00:00
some changes
This commit is contained in:
Eudes Inácio
@@ -53,7 +53,6 @@ export class AppComponent {
|
||||
window.screen.orientation.unlock();
|
||||
} else if( this.platform.is("mobile")) {
|
||||
window.screen.orientation.lock('portrait');
|
||||
// console.log('Orientation locked')
|
||||
}
|
||||
|
||||
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
|
||||
@@ -62,7 +61,7 @@ export class AppComponent {
|
||||
try {
|
||||
this.sqliteservice.databaseConn();
|
||||
} catch (error) {
|
||||
console.error("Error creating local database: ", error)
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -23,18 +23,13 @@ export class AuthGuard implements CanActivate {
|
||||
route: ActivatedRouteSnapshot,
|
||||
state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
|
||||
|
||||
console.log('hire auth!', state.url)
|
||||
|
||||
// if user not active or no session
|
||||
if(!SessionStore.user.Inactivity || !SessionStore.exist) {
|
||||
|
||||
// console.log('no session', !SessionStore.user.Inactivity, !SessionStore.exist)
|
||||
// console.log(SessionStore.user)
|
||||
if(SessionStore.user.LoginPreference == 'Pin') {
|
||||
this.router.navigate(['/pin']);
|
||||
} else {
|
||||
this.router.navigate(['/']);
|
||||
// console.log('goto login page')
|
||||
}
|
||||
|
||||
return false
|
||||
@@ -48,7 +43,6 @@ export class AuthGuard implements CanActivate {
|
||||
return true;
|
||||
} else {
|
||||
this.router.navigate(['/login']);
|
||||
console.log('£1')
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -59,7 +53,6 @@ export class AuthGuard implements CanActivate {
|
||||
return true;
|
||||
} else {
|
||||
this.router.navigate(['/login']);
|
||||
console.log('£2')
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -67,8 +60,6 @@ export class AuthGuard implements CanActivate {
|
||||
if(this.p.userPermission(this.p.permissionList.Chat.access)) {
|
||||
return true;
|
||||
} else {
|
||||
console.log("no access to chat")
|
||||
console.log('£3')
|
||||
this.router.navigate(['/login']);
|
||||
return false;
|
||||
}
|
||||
@@ -76,7 +67,6 @@ export class AuthGuard implements CanActivate {
|
||||
if(this.p.userPermission(this.p.permissionList.Actions.access)) {
|
||||
return true
|
||||
} else {
|
||||
console.log('£4')
|
||||
this.router.navigate(['/login']);
|
||||
return false
|
||||
}
|
||||
@@ -84,18 +74,13 @@ export class AuthGuard implements CanActivate {
|
||||
if(SessionStore.user.OwnerCalendars.length >= 1 || this.p.userPermission([this.p.permissionList.Gabinete.access])) {
|
||||
return true
|
||||
} else {
|
||||
console.log('£5')
|
||||
this.router.navigate(['/login']);
|
||||
return false
|
||||
}
|
||||
} else if (pathname == '/') {
|
||||
console.log('£6')
|
||||
this.router.navigate(['/login']);
|
||||
console.log('no path')
|
||||
return false
|
||||
} else {
|
||||
console.log('£7')
|
||||
console.log('pathname not match')
|
||||
this.router.navigate(['/login']);
|
||||
return false
|
||||
}
|
||||
|
||||
@@ -21,9 +21,6 @@ export class LoginGuard implements CanActivate {
|
||||
route: ActivatedRouteSnapshot,
|
||||
state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
|
||||
|
||||
console.log('hire login!', state.url, SessionStore.user)
|
||||
|
||||
|
||||
if(SessionStore.exist && SessionStore.user.Inactivity && SessionStore.user.LoginPreference != 'Pin' ) {
|
||||
// enter app
|
||||
this.FirstEnterService.enter()
|
||||
|
||||
@@ -170,7 +170,6 @@ export class HomePage implements OnInit {
|
||||
})
|
||||
|
||||
window.addEventListener('offline', () => {
|
||||
// console.log('Became offline')
|
||||
this.backgroundservice.offline()
|
||||
});
|
||||
|
||||
@@ -245,11 +244,11 @@ export class HomePage implements OnInit {
|
||||
updateList() {
|
||||
|
||||
document.addEventListener('pause', function () {
|
||||
// console.log('App going to background');
|
||||
|
||||
});
|
||||
|
||||
document.addEventListener('resume', function () {
|
||||
// console.log('App coming to foreground');
|
||||
|
||||
});
|
||||
|
||||
}
|
||||
@@ -265,7 +264,7 @@ export class HomePage implements OnInit {
|
||||
});
|
||||
})
|
||||
} catch (error) {
|
||||
console.log(error)
|
||||
|
||||
}
|
||||
|
||||
try {
|
||||
@@ -277,7 +276,7 @@ export class HomePage implements OnInit {
|
||||
});
|
||||
})
|
||||
} catch (error) {
|
||||
console.log(error)
|
||||
|
||||
}
|
||||
|
||||
try {
|
||||
@@ -289,7 +288,7 @@ export class HomePage implements OnInit {
|
||||
});
|
||||
})
|
||||
} catch (error) {
|
||||
console.log(error)
|
||||
|
||||
}
|
||||
|
||||
this.sqliteservice.deleteAllTables();
|
||||
|
||||
@@ -104,7 +104,7 @@ export class CreateProcessPage implements OnInit {
|
||||
this.loggeduser = SessionStore.user;
|
||||
this.task = this.navParams.get('task');
|
||||
this.fulltask = this.navParams.get('fulltask');
|
||||
console.log(this.task)
|
||||
|
||||
if (this.task.SerialNumber) {
|
||||
this.task.serialNumber = this.task.SerialNumber
|
||||
}
|
||||
@@ -157,7 +157,7 @@ export class CreateProcessPage implements OnInit {
|
||||
/* By Default TypeDeadline should be 'Normal' */
|
||||
this.postData.Priority = '99999861';
|
||||
/* Initialize 'Subject' with the title of the expedient */
|
||||
console.log('Subject', this.fulltask)
|
||||
|
||||
this.postData.DispatchFolder.Subject = this.task?.workflowInstanceDataFields?.Subject || this.fulltask?.workflowInstanceDataFields?.Subject;
|
||||
this.profile = this.navParams.get('profile');
|
||||
}
|
||||
@@ -283,8 +283,6 @@ export class CreateProcessPage implements OnInit {
|
||||
this.dispatchFolder.SubjectTypes = this.selectedTypes;
|
||||
const loader = this.toastService.loading()
|
||||
|
||||
console.log(this.fulltask, 'fulltask')
|
||||
|
||||
if (this.fulltask.activityInstanceName == "Assinar Diploma") {
|
||||
this.postData = {
|
||||
DistributionType: "Paralelo",
|
||||
@@ -308,7 +306,7 @@ export class CreateProcessPage implements OnInit {
|
||||
}
|
||||
|
||||
} else {
|
||||
console.log('1')
|
||||
|
||||
if (this.loggeduser.Profile != 'PR') {
|
||||
switch (this.taskType) {
|
||||
case '0': // Despacho
|
||||
@@ -396,7 +394,7 @@ export class CreateProcessPage implements OnInit {
|
||||
} else if (this.loggeduser.Profile == 'PR') {
|
||||
switch (this.taskType) {
|
||||
case '0': // Despacho PR
|
||||
console.log('12')
|
||||
|
||||
this.postData = {
|
||||
DistributionType: "Paralelo",
|
||||
CountryCode: 'AO',
|
||||
@@ -428,7 +426,6 @@ export class CreateProcessPage implements OnInit {
|
||||
break;
|
||||
case '1': // Pedido de Parecer
|
||||
|
||||
console.log('13')
|
||||
this.postData = {
|
||||
DistributionType: "Paralelo",
|
||||
CountryCode: 'AO',
|
||||
@@ -460,7 +457,7 @@ export class CreateProcessPage implements OnInit {
|
||||
|
||||
break;
|
||||
case '2': // Pedido de Deferimento
|
||||
console.log('123')
|
||||
|
||||
this.postData = {
|
||||
DistributionType: "Paralelo",
|
||||
CountryCode: 'AO',
|
||||
@@ -558,7 +555,7 @@ export class CreateProcessPage implements OnInit {
|
||||
}
|
||||
|
||||
} else {
|
||||
// console.log('unexpected error')
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -721,7 +718,7 @@ export class CreateProcessPage implements OnInit {
|
||||
});
|
||||
await modal.present();
|
||||
modal.onDidDismiss().then((res) => {
|
||||
/* console.log('!refresh list'); */
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -77,7 +77,7 @@ export class DocumentDetailPage implements OnInit {
|
||||
} else if (document.ApplicationID == 8 || document.ApplicationId == 8) {
|
||||
|
||||
} else {
|
||||
// console.log('unexpected id')
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -298,7 +298,6 @@ export class DocumentSetUpMeetingPage implements OnInit {
|
||||
this.httpErroHandle.httpsSucessMessagge('new event');
|
||||
this.modalController.dismiss()
|
||||
}, (error) => {
|
||||
console.log('error', error)
|
||||
laoder.remove();
|
||||
this.httpErroHandle.httpStatusHandle(error)
|
||||
}, ()=>{
|
||||
|
||||
@@ -44,8 +44,6 @@ ngOnInit() {
|
||||
this.image = this.navParams.get('image')
|
||||
this.name = this.navParams.get('username')
|
||||
this._updatedAt = this.navParams.get('_updatedAt')
|
||||
// console.log(this.image)
|
||||
// this.image = this.myimage
|
||||
}
|
||||
|
||||
ionViewDidEnter(){
|
||||
|
||||
@@ -57,7 +57,6 @@ export class ProfilePage implements OnInit {
|
||||
if(event.notification == "recive") {
|
||||
this.getNotificationData();
|
||||
}
|
||||
console.log(event)
|
||||
});
|
||||
|
||||
setTimeout(() => {
|
||||
@@ -150,7 +149,6 @@ export class ProfilePage implements OnInit {
|
||||
|
||||
notificatinsRoutes = (index, Service, Object, IdObject, FolderId) => {
|
||||
|
||||
// console.log(index, Service, Object, IdObject, FolderId)
|
||||
|
||||
if (Service === "agenda" && IdObject.length > 10) {
|
||||
this.zone.run(() => this.router.navigate(['/home/agenda', IdObject, 'agenda']));
|
||||
@@ -210,13 +208,11 @@ export class ProfilePage implements OnInit {
|
||||
|
||||
deleteNotification(index) {
|
||||
this.notificationdata = this.notificationdata.filter(item => item.index != index);
|
||||
console.log(this.notificationdata)
|
||||
console.log(this.notificationdata)
|
||||
|
||||
this.storageservice.store("Notifications", this.notificationdata).then((store) => {
|
||||
console.log(store)
|
||||
|
||||
this.storageservice.get("Notifications").then((value) => {
|
||||
console.log(value)
|
||||
|
||||
}).catch((error) => {
|
||||
console.error('storage delete notification: ',error)
|
||||
})
|
||||
@@ -239,7 +235,7 @@ export class ProfilePage implements OnInit {
|
||||
if(this.logoutOut == false || pathBeforeGoOut == window.location.pathname) {
|
||||
window.location.pathname = '/auth'
|
||||
} else {
|
||||
console.log('refresh')
|
||||
|
||||
}
|
||||
}, 500)
|
||||
}
|
||||
|
||||
@@ -82,7 +82,6 @@ export class SetRoomOwnerPage implements OnInit {
|
||||
}
|
||||
|
||||
this.chatService.addGroupOwner(body).subscribe((res)=>{
|
||||
console.log(res);
|
||||
this.close();
|
||||
this.toastService._successMessage('Operação realizada com sucesso');
|
||||
}, (e) => {
|
||||
|
||||
@@ -104,7 +104,7 @@ export class ViewDocumentPage implements OnInit {
|
||||
} else if(res.data.component == 'openExpedientActionsModal') {
|
||||
this.openExpedientActionsModal(res.data.taskAction)
|
||||
} else {
|
||||
// console.log('not found')
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -152,7 +152,7 @@ export class ViewEventPage implements OnInit {
|
||||
} else {
|
||||
|
||||
if(this.CalendarId) {
|
||||
console.log('calendar id')
|
||||
|
||||
this.eventsService.genericGetEvent(this.eventId, this.CalendarId).subscribe(res => {
|
||||
this.loadedEvent = res;
|
||||
this.addEventToDb(res);
|
||||
@@ -171,7 +171,7 @@ export class ViewEventPage implements OnInit {
|
||||
loader.remove()
|
||||
});
|
||||
} else {
|
||||
console.log('no calendar id')
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -37,7 +37,7 @@ export class ViewMediaPage implements OnInit {
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
// console.log(this.image)
|
||||
|
||||
this.base64Sanitize = this.sanitizer.bypassSecurityTrustResourceUrl(this.image);
|
||||
|
||||
if (this.platform.is('desktop')) {
|
||||
|
||||
@@ -238,14 +238,6 @@ export class AgendaPage implements OnInit {
|
||||
|
||||
this.tigerUpdate()
|
||||
|
||||
window['year'] = this.changeYear
|
||||
|
||||
console.log('SessionStore.user', SessionStore.user)
|
||||
|
||||
|
||||
setTimeout(() =>{
|
||||
console.log(this.TimelineMDList);
|
||||
}, 500)
|
||||
|
||||
}
|
||||
|
||||
@@ -541,7 +533,7 @@ export class AgendaPage implements OnInit {
|
||||
|
||||
this.loadRangeEventRun(startTime, endTime)
|
||||
} else {
|
||||
// console.log('dont call')
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -587,9 +579,6 @@ export class AgendaPage implements OnInit {
|
||||
label = "pr"
|
||||
}
|
||||
|
||||
console.log('label', label)
|
||||
|
||||
// this.addEventToDB(response, label);
|
||||
let eventsList = response;
|
||||
this.CalendarStore.removeRangeForCalendar(startTime, endTime, label, selectedCalendar.CalendarId)
|
||||
this.CalendarStore.pushEvent(eventsList, label);
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
<ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
|
||||
</div>
|
||||
<div class="ion-input-class" [class.input-error]="Form?.get('Location')?.invalid && validateFrom ">
|
||||
<ion-input autocomplete="on" autocorrect="on" spellcheck="true" placeholder="Localização" [(ngModel)]="postEvent.Location"></ion-input>
|
||||
<ion-input autocomplete="on" autocorrect="on" spellcheck="true" placeholder="Localização*" [(ngModel)]="postEvent.Location"></ion-input>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -54,7 +54,7 @@
|
||||
<ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
|
||||
</div>
|
||||
<div class="ion-input-class" [class.input-error]="Form?.get('Location')?.invalid && validateFrom ">
|
||||
<ion-input autocomplete="on" autocorrect="on" spellcheck="true" placeholder="Localização" [(ngModel)]="postEvent.Location"></ion-input>
|
||||
<ion-input autocomplete="on" autocorrect="on" spellcheck="true" placeholder="Localização*" [(ngModel)]="postEvent.Location"></ion-input>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -24,10 +24,10 @@
|
||||
|
||||
<div class="conteiner-box pt-20 height-100">
|
||||
|
||||
<div class="main-content height-100">
|
||||
<div class="box-container d-flex mx-20" style="padding: 0px;overflow: hidden;">
|
||||
<div class="main-content justify-center d-flex height-100">
|
||||
<div class="box-container width-100 d-flex mx-20" style="padding: 0px;overflow: hidden;">
|
||||
<ion-progress-bar type="indeterminate" *ngIf="loadingAllTask"></ion-progress-bar>
|
||||
<div class="px-20">
|
||||
<div class="px-20 pb-20">
|
||||
<p class="time ion-text-left ">{{customDate}}</p>
|
||||
<div class="wrap d-flex float-left">
|
||||
<div class="event-box pointer" (click)="goToAllTaskFilter('ForToDay')">
|
||||
|
||||
@@ -629,4 +629,16 @@ ion-title{
|
||||
|
||||
.conteiner-box-mobile {
|
||||
display: none;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
@media screen and (max-width: 400px) {
|
||||
.box-container {
|
||||
width: 360px;
|
||||
margin: 0px auto;
|
||||
margin-left: 0px !important;
|
||||
margin-right: 0px !important;
|
||||
}
|
||||
}
|
||||
@@ -86,11 +86,7 @@ export class EventsPage implements OnInit {
|
||||
|
||||
|
||||
|
||||
(async () =>{
|
||||
this.loadingAllTask = true
|
||||
await this.TaskService.LoadTask()
|
||||
this.loadingAllTask = false
|
||||
})()
|
||||
this.loadAllTask();
|
||||
|
||||
|
||||
window['zipPhoneCallback'] = function (zipphone) {
|
||||
@@ -130,9 +126,12 @@ export class EventsPage implements OnInit {
|
||||
this.hideSearch();
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
// this.getEventsFromLocalDb();
|
||||
|
||||
async loadAllTask() {
|
||||
this.loadingAllTask = true
|
||||
await this.TaskService.LoadTask()
|
||||
this.loadingAllTask = false
|
||||
}
|
||||
|
||||
hideSearch() {
|
||||
@@ -149,8 +148,10 @@ export class EventsPage implements OnInit {
|
||||
} catch(error) {}
|
||||
}, 2000);
|
||||
}
|
||||
|
||||
this.RefreshEvents();
|
||||
this.LoadList();
|
||||
this.loadAllTask();
|
||||
}
|
||||
|
||||
onSegmentChange() {
|
||||
@@ -358,6 +359,4 @@ export class EventsPage implements OnInit {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -17,7 +17,8 @@ import { TaskDetailsPageModule } from 'src/app/shared/gabinete-digital/generic/t
|
||||
IonicModule,
|
||||
|
||||
DespachoPageRoutingModule,
|
||||
TaskDetailsPageModule
|
||||
TaskDetailsPageModule,
|
||||
SharedModule
|
||||
],
|
||||
declarations: [
|
||||
DespachoPage,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<ion-content class="container-wrapper">
|
||||
<div class="main-content d-flex height-100 overflow-hidden">
|
||||
<div class="content d-flex align-center flex-column" *ngIf="task">
|
||||
<div class="content d-flex flex-column" *ngIf="task">
|
||||
<div class="main-header">
|
||||
<div class="title-content width-100 d-flex align-center justify-space-between">
|
||||
<div class="font-30 cursor-pointer d-flex align-center" (click)="goBack()" defaultHref="#">
|
||||
|
||||
@@ -324,6 +324,7 @@ export class DiplomaPage implements OnInit {
|
||||
const modal = await this.modalController.create({
|
||||
component: AddNotePage,
|
||||
componentProps: {
|
||||
showAttachmentBtn: false,
|
||||
actionName:actionName
|
||||
},
|
||||
cssClass: classs,
|
||||
|
||||
@@ -85,10 +85,10 @@
|
||||
<ion-list class="width-100 height-100" >
|
||||
<div class="overflow-y-auto height-100">
|
||||
<ion-item-sliding>
|
||||
<ion-item class="Rectangle cursor-pointer" lines="none"
|
||||
<ion-item class="Rectangle cursor-pointer " lines="none"
|
||||
*ngFor="let event of eventoaprovacaostore.get(segment)" (click)="goToEventToApproveDetail(event.serialNumber)">
|
||||
|
||||
<div class="content-{{color}}-{{event.workflowInstanceDataFields.Agenda}} width-100">
|
||||
<div class="content-{{color}}-{{event.workflowInstanceDataFields.Agenda}} width-100 d-flex overflow-hidden">
|
||||
<div class="approve-event-time">
|
||||
<p>{{event.workflowInstanceDataFields.StartDate | date: 'HH:mm'}}</p>
|
||||
<p>{{event.workflowInstanceDataFields.EndDate | date: 'HH:mm'}}</p>
|
||||
|
||||
@@ -58,7 +58,7 @@ ion-item-sliding{
|
||||
overflow: auto;
|
||||
}
|
||||
.content-pr-Pessoal{
|
||||
background-color: var(--white);
|
||||
background-color: vfar(--white);
|
||||
border-radius: 5px;
|
||||
border-right: 5px solid #958bfc;
|
||||
border-left: unset !important;
|
||||
@@ -77,9 +77,7 @@ ion-item-sliding{
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
.approve-event-time{
|
||||
float: left;
|
||||
}
|
||||
|
||||
.approve-event-time p{
|
||||
width: 33px;
|
||||
font-family: Roboto;
|
||||
@@ -94,7 +92,6 @@ ion-item-sliding{
|
||||
padding: 0;
|
||||
}
|
||||
.approve-event-detail{
|
||||
float: left;
|
||||
margin-left: 10px;
|
||||
}
|
||||
.approve-event-detail p{
|
||||
@@ -136,4 +133,9 @@ ion-item-sliding{
|
||||
border-radius: 17px;
|
||||
color: white;
|
||||
font-size: 10pt;
|
||||
}
|
||||
|
||||
|
||||
.overflow-hidden {
|
||||
overflow: hidden
|
||||
}
|
||||
@@ -115,65 +115,6 @@ export class EventListPage implements OnInit {
|
||||
}
|
||||
|
||||
|
||||
getEventToAproveFromDB() {
|
||||
|
||||
|
||||
|
||||
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
|
||||
this.storage.get('event-to-aproveMD').then((events = []) => {
|
||||
this.eventsMDGPRList = events
|
||||
})
|
||||
|
||||
this.storage.get('event-to-aprovePR').then((events = []) => {
|
||||
this.eventsPRList = events
|
||||
})
|
||||
} else {
|
||||
this.platform.ready().then(() => {
|
||||
|
||||
this.sqliteservice.getListOfEventAprove('Agenda Oficial MDGPR', 'Agenda Pessoal MDGPR').then((event: any[] = []) => {
|
||||
|
||||
this.eventsMDGPRList = this.sortService.sortDate(this.transformaDataDB(event), 'taskStartDate')
|
||||
|
||||
})
|
||||
|
||||
this.sqliteservice.getListOfEventAprove('Agenda Oficial PR', 'Agenda Pessoal PR').then((event: any[] = []) => {
|
||||
this.eventsPRList = this.sortService.sortDate(this.transformaDataDB(event), 'taskStartDate')
|
||||
})
|
||||
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
transformaDataDB(events = []) {
|
||||
let MdEventsArray = [];
|
||||
for (let i of events) {
|
||||
let eventMD = {
|
||||
Documents: i.Documents,
|
||||
actions: i.actions,
|
||||
activityInstanceName: i.activityInstanceName,
|
||||
formURL: i.formURL,
|
||||
interveners: i.interveners,
|
||||
originator: i.originator,
|
||||
serialNumber: i.serialNumber,
|
||||
taskStartDate: i.taskStartDate,
|
||||
totalDocuments: i.totalDocuments,
|
||||
workflowDisplayName: i.workflowDisplayName,
|
||||
workflowID: i.workflowID,
|
||||
workflowInstanceDataFields: JSON.parse(i.workflowInstanceDataFields),
|
||||
workflowInstanceFolio: i.workflowInstanceFolio,
|
||||
workflowInstanceID: i.workflowInstanceID,
|
||||
workflowName: i.workflowName,
|
||||
}
|
||||
|
||||
MdEventsArray.push(eventMD);
|
||||
}
|
||||
return MdEventsArray;
|
||||
}
|
||||
|
||||
segmentChanged(ev: any) {
|
||||
this.LoadToApproveEvents();
|
||||
}
|
||||
@@ -211,7 +152,6 @@ export class EventListPage implements OnInit {
|
||||
this.eventsList = []
|
||||
}
|
||||
|
||||
this.eventsList = this.eventsList
|
||||
this.eventsList = this.eventsList
|
||||
this.showLoader = false;
|
||||
this.eventoaprovacaostore.save(segment.OwnerUserId, this.eventsList)
|
||||
@@ -268,8 +208,8 @@ export class EventListPage implements OnInit {
|
||||
setTimeout(() => {
|
||||
this.LoadToApproveEvents();
|
||||
try {
|
||||
event?.target?.complete();
|
||||
} catch(error) {}
|
||||
event?.target?.complete();
|
||||
} catch(error) {}
|
||||
}, 1000);
|
||||
}
|
||||
|
||||
@@ -277,13 +217,6 @@ export class EventListPage implements OnInit {
|
||||
this.modalController.dismiss(null);
|
||||
}
|
||||
goBack() {
|
||||
// if(this.router.url == '/home/agenda/event-list') {
|
||||
// this.router.navigate(['/home/agenda']);
|
||||
// }
|
||||
// else if(this.router.url == '/home/gabinete-digital/event-list'){
|
||||
// this.router.navigate(['/home/gabinete-digital']);
|
||||
// }
|
||||
|
||||
this.RouteService.goBack()
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -61,7 +61,7 @@
|
||||
<ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
|
||||
</div>
|
||||
<div class="ion-input-class" [class.input-error]="Form?.get('Location')?.invalid && validateFrom ">
|
||||
<ion-input autocomplete="on" autocorrect="on" spellcheck="true" placeholder="Localização" [(ngModel)]="postData.Location"></ion-input>
|
||||
<ion-input autocomplete="on" autocorrect="on" spellcheck="true" placeholder="Localização*" [(ngModel)]="postData.Location"></ion-input>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -221,8 +221,6 @@ export class GabineteDigitalPage implements OnInit {
|
||||
}
|
||||
}
|
||||
|
||||
console.log('order', this.ordinance)
|
||||
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
@@ -280,58 +278,7 @@ export class GabineteDigitalPage implements OnInit {
|
||||
this.LoadCounts();
|
||||
}
|
||||
|
||||
addProcessToDB(data) {}
|
||||
|
||||
getAllProcessFromDB() {}
|
||||
|
||||
dataTranform(data) {
|
||||
|
||||
}
|
||||
|
||||
sortArrayISODate(myArray: any): any[] {
|
||||
// return myArray.sort(function (a, b) {
|
||||
// return (a.CreateDate < b.CreateDate) ? -1 : ((a.CreateDate > b.CreateDate) ? 1 : 0);
|
||||
// });
|
||||
|
||||
return myArray.sort((a,b) => Date.parse(b.CreateDate || b.taskStartDate) - Date.parse(a.CreateDate || a.taskStartDate))
|
||||
}
|
||||
|
||||
setFormatDate(start: any, end: any, allday: boolean) {
|
||||
let customDate;
|
||||
|
||||
const totalSeconds = Math.floor((end - (start)) / 1000);;
|
||||
const totalMinutes = Math.floor(totalSeconds / 60);
|
||||
const totalHours = Math.floor(totalMinutes / 60);
|
||||
const totalDays = Math.floor(totalHours / 24);
|
||||
|
||||
if (totalDays == 0) {
|
||||
if (allday) {
|
||||
customDate = this.getCustomDate(start) + ", " + this.getCustomHours(start) + " (todo dia)";
|
||||
|
||||
return customDate;
|
||||
}
|
||||
else {
|
||||
customDate = this.getCustomDate(start) + ", " + this.getCustomHours(start) + " | " + this.getCustomHours(end);
|
||||
return customDate;
|
||||
}
|
||||
}
|
||||
else {
|
||||
customDate = this.getCustomDate(start) + "," + this.getCustomHours(start) +
|
||||
" (termina:" + this.getCustomDate(end) + "," + this.getCustomHours(end) + ")";
|
||||
return customDate;
|
||||
}
|
||||
}
|
||||
|
||||
getCustomDate(thedate: Date) {
|
||||
return thedate.getDate() + "/" +
|
||||
(thedate.getMonth() + 1) + "/" +
|
||||
thedate.getFullYear();
|
||||
}
|
||||
|
||||
getCustomHours(thedate: Date) {
|
||||
return thedate.getHours() + ":" +
|
||||
thedate.getMinutes();
|
||||
}
|
||||
goto(url) {
|
||||
this.router.navigate([url])
|
||||
}
|
||||
@@ -355,7 +302,7 @@ export class GabineteDigitalPage implements OnInit {
|
||||
else if (activityName == 'Diploma Assinado') {
|
||||
this.router.navigate(['/home/gabinete-digital/diplomas-assinar', serialNumber, 'gabinete-digital']);
|
||||
} else {
|
||||
console.log('no route!')
|
||||
|
||||
}
|
||||
}
|
||||
else if (workflowName == 'Pedido de Parecer' || workflowName == 'Pedido de Deferimento') {
|
||||
@@ -382,10 +329,6 @@ export class GabineteDigitalPage implements OnInit {
|
||||
|
||||
}
|
||||
|
||||
onSegmentVistaChange() {
|
||||
|
||||
}
|
||||
|
||||
checkUser() {
|
||||
this.selectedElement = 'allProcessesTag';
|
||||
this.showAllProcesses = true;
|
||||
@@ -501,8 +444,10 @@ export class GabineteDigitalPage implements OnInit {
|
||||
}
|
||||
|
||||
async LoadCounts() {
|
||||
|
||||
|
||||
// this.skeletonLoader = true
|
||||
await this.TaskService.LoadTask()
|
||||
// this.skeletonLoader = false
|
||||
}
|
||||
|
||||
doRefresh(event) {
|
||||
|
||||
@@ -30,6 +30,8 @@ export class AuthService {
|
||||
public isWsAuthenticated: boolean = false;
|
||||
opts:any;
|
||||
|
||||
tabIsActive = true
|
||||
|
||||
constructor(
|
||||
private http: HttpClient,
|
||||
private storageService:StorageService,
|
||||
@@ -52,6 +54,22 @@ export class AuthService {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
window.addEventListener('focus', (event) => {
|
||||
if(!this.tabIsActive) {
|
||||
this.tabIsActive = true
|
||||
const data = SessionStore.getDataFromLocalStorage();
|
||||
|
||||
if(!data?.user?.Authorization && SessionStore?.user?.Authorization) {
|
||||
window.location.reload();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
window.addEventListener('blur', (event) => {
|
||||
this.tabIsActive = false
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
async login(user: UserForm, {saveSession = true}): Promise<LoginUserRespose> {
|
||||
@@ -72,7 +90,6 @@ export class AuthService {
|
||||
this.SetSession(response, user)
|
||||
}
|
||||
} catch (error) {
|
||||
console.log(error)
|
||||
this.httpErroHandle.httpStatusHandle(error)
|
||||
} finally {
|
||||
return response
|
||||
@@ -100,8 +117,6 @@ export class AuthService {
|
||||
session.BasicAuthKey = user.BasicAuthKey
|
||||
SessionStore.reset(session)
|
||||
|
||||
// console.log(session)
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -127,7 +142,7 @@ export class AuthService {
|
||||
|
||||
|
||||
}).catch((error) => {
|
||||
console.error(SessionStore.user.ChatData, 'web socket login',error)
|
||||
// console.error(SessionStore.user.ChatData, 'web socket login',error)
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -94,7 +94,6 @@ export class ChatService {
|
||||
}
|
||||
|
||||
getAllUsers() {
|
||||
// console.log(this.options)
|
||||
return this.http.get(environment.apiChatUrl + 'users.list', this.options);
|
||||
}
|
||||
getAllConnectedUsers() {
|
||||
@@ -365,7 +364,7 @@ export class ChatService {
|
||||
}
|
||||
}
|
||||
} catch (error) {
|
||||
console.log(error)
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -334,13 +334,9 @@ export class ChatSystemService {
|
||||
this.defaultSubtribe(id)
|
||||
}
|
||||
|
||||
this.RochetChatConnectorService.streamNotifyLogged().then((subscription => {
|
||||
console.log(subscription)
|
||||
}))
|
||||
this.RochetChatConnectorService.streamNotifyLogged().then((subscription => {}))
|
||||
|
||||
this.RochetChatConnectorService.subStreamMessageUser().then((subscription => {
|
||||
console.log(subscription)
|
||||
}))
|
||||
this.RochetChatConnectorService.subStreamMessageUser().then((subscription => {}))
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -133,7 +133,6 @@ export class MessageService {
|
||||
} else if( this.u.username == SessionStore.user.UserName) {
|
||||
this.u.name = SessionStore.user.FullName
|
||||
} else {
|
||||
// console.log(user.username, SessionStore.user.UserName)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -290,7 +289,6 @@ export class MessageService {
|
||||
clearTimeout(this.functionTimer);
|
||||
|
||||
this.redefinedMessage(ChatMessage)
|
||||
// console.log()
|
||||
}
|
||||
).catch((error) => {
|
||||
clearTimeout(this.functionTimer);
|
||||
@@ -369,7 +367,6 @@ export class MessageService {
|
||||
|
||||
if(!roomObject.isGroup) {
|
||||
var memeberTosend = this.ChatSystemService.getRoomById(this.rid).membersExcludeMe
|
||||
console.log(ChatMessage)
|
||||
this.notificationService.ChatSendMessageNotification(memeberTosend[0].username,ChatMessage.u.name,ChatMessage.msg,this.rid)
|
||||
} else {
|
||||
var memeberTosend = this.ChatSystemService.getRoomById(this.rid).membersExcludeMe
|
||||
@@ -571,7 +568,6 @@ export class MessageService {
|
||||
|
||||
} else {
|
||||
this.earlySave = true
|
||||
console.log('save change to early')
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -38,7 +38,6 @@ export class RochetChatConnectorService {
|
||||
key:'ping-pong',
|
||||
funx:(message: any) => {
|
||||
if(message.msg == "ping") {
|
||||
// console.log(message)
|
||||
this.ws.send({message:{msg:"pong"}, loginRequired: false})
|
||||
}
|
||||
}
|
||||
@@ -799,8 +798,6 @@ export class RochetChatConnectorService {
|
||||
this.wsMsgQueue[requestId] = {message, requestId, loginRequired}
|
||||
} else {
|
||||
let messageStr = JSON.stringify(message)
|
||||
//
|
||||
// console.log(messageStr)
|
||||
this.socket.send(messageStr)
|
||||
}
|
||||
return requestId
|
||||
@@ -808,8 +805,6 @@ export class RochetChatConnectorService {
|
||||
|
||||
onmessage: async (event: any)=> {
|
||||
const data = JSON.parse(event.data)
|
||||
|
||||
// console.log('data', data)
|
||||
|
||||
for (const [key, value] of Object.entries(this.wsCallbacks)) {
|
||||
if(value.type== 'Onmessage') {
|
||||
|
||||
@@ -722,7 +722,7 @@ export class RoomService {
|
||||
this.registerSendMessage(offlineMessage)
|
||||
offlineMessage?.decryptMessage()
|
||||
offlineMessage.send()
|
||||
// console.log('send offline', ChatMessage)
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -876,20 +876,19 @@ export class RoomService {
|
||||
|
||||
private async findMessageInDBByData({localReference, _id}) {
|
||||
|
||||
// console.log('look')
|
||||
const a = await MessageModel.filter({localReference: localReference})
|
||||
if(a.length >= 1) {
|
||||
// console.log('localReference', localReference)
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
const c = await MessageModel.filter({_id: _id})
|
||||
if(c.length >= 1) {
|
||||
// console.log('_id', _id)
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
// console.log('look not found')
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
|
||||
@@ -26,9 +26,9 @@ export class NativeNotificationService {
|
||||
}
|
||||
|
||||
foregroundNotification() {
|
||||
console.log('Local notification foreground')
|
||||
|
||||
LocalNotifications.addListener('localNotificationReceived', (notification) => {
|
||||
console.log('Local Notification',notification)
|
||||
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@ export class NetworkServiceService {
|
||||
});
|
||||
|
||||
this.onNetworkChange().subscribe((status) => {
|
||||
console.log(status)
|
||||
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
@@ -10,7 +10,6 @@ self.addEventListener('activate', function(event) {
|
||||
self.addEventListener('notificationclick', function(event) {
|
||||
// Close the notification when it is clicked
|
||||
event.notification.close();
|
||||
// console.log(event)
|
||||
});
|
||||
|
||||
|
||||
|
||||
@@ -119,9 +119,9 @@ export class NotificationsService {
|
||||
|
||||
this.http.post<Tokenn>(`${geturl}`, body, { headers }).subscribe(data => {
|
||||
this.active = true
|
||||
console.log(data)
|
||||
|
||||
}, (error) => {
|
||||
console.log(error)
|
||||
|
||||
})
|
||||
}
|
||||
);
|
||||
@@ -146,13 +146,11 @@ export class NotificationsService {
|
||||
return false
|
||||
}
|
||||
|
||||
console.log('foregrund');
|
||||
|
||||
PushNotifications.addListener('pushNotificationReceived',
|
||||
(notification: PushNotificationSchema) => {
|
||||
this.active = true
|
||||
console.log(notification)
|
||||
//this.DataArray.push(notification)
|
||||
//console.log(this.DataArray)
|
||||
|
||||
|
||||
this.storageService.get("Notifications").then((store) => {
|
||||
store.push(notification)
|
||||
@@ -177,11 +175,9 @@ export class NotificationsService {
|
||||
return false
|
||||
}
|
||||
|
||||
console.log('fbackgrund');
|
||||
PushNotifications.addListener('pushNotificationActionPerformed',
|
||||
(notification: ActionPerformed) => {
|
||||
this.active = true
|
||||
console.log(notification)
|
||||
/* this.DataArray.push(notification.notification)
|
||||
|
||||
this.storageService.store("Notifications", this.DataArray)
|
||||
@@ -203,12 +199,10 @@ export class NotificationsService {
|
||||
"IdObject": roomId
|
||||
}
|
||||
let id = 437
|
||||
console.log(userID, title, bodymsg, roomId)
|
||||
this.http.post<Tokenn>(geturl + `?username=${userID}&title=${title}&body=${bodymsg}`, message, { headers }).subscribe(data => {
|
||||
this.active = true
|
||||
console.log(data)
|
||||
}, (error) => {
|
||||
console.log(error)
|
||||
|
||||
})
|
||||
}
|
||||
|
||||
@@ -223,12 +217,11 @@ export class NotificationsService {
|
||||
"IdObject": roomId
|
||||
}
|
||||
}
|
||||
console.log(usersID, title, bodymsg, roomId)
|
||||
|
||||
this.http.post<Tokenn>(geturl + `?title=${title}&body=${bodymsg}`, message, { headers }).subscribe(data => {
|
||||
this.active = true
|
||||
console.log(data)
|
||||
}, (error) => {
|
||||
console.log(error)
|
||||
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -77,8 +77,6 @@ export class ProcessesService {
|
||||
params = params.set("pageSize", 500);
|
||||
params = params.set("userid", userid);
|
||||
|
||||
// console.log(userid, caller)
|
||||
|
||||
let options = {
|
||||
headers: this.headers,
|
||||
params: params
|
||||
|
||||
@@ -168,9 +168,8 @@ export class TaskService {
|
||||
try {
|
||||
await this.loadExpedientes()
|
||||
this.loadCount = true;
|
||||
this.showLoader = false;
|
||||
|
||||
} catch(error) {
|
||||
this.showLoader = false
|
||||
this.loadCount = true;
|
||||
}
|
||||
|
||||
@@ -187,6 +186,7 @@ export class TaskService {
|
||||
|
||||
await this.loadEventosParaAprovacao()
|
||||
this.loadCount = true
|
||||
this.showLoader = false;
|
||||
}
|
||||
|
||||
async loadDespachos() {
|
||||
|
||||
@@ -76,7 +76,6 @@ export class ApproveEventPage implements OnInit {
|
||||
this.processes.GetTask(this.serialNumber).subscribe(res => {
|
||||
|
||||
this.loadedEvent = res;
|
||||
// console.log(this.loadedEvent);
|
||||
this.today = new Date(res.workflowInstanceDataFields.StartDate);
|
||||
//
|
||||
this.customDate = this.days[this.today.getDay()]+ ", " + this.today.getDate() +" de " + ( this.months[this.today.getMonth()]);
|
||||
|
||||
@@ -38,7 +38,7 @@
|
||||
<ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
|
||||
</div>
|
||||
<div class="ion-input-class" [class.input-error]="Form?.get('Location')?.invalid && validateFrom ">
|
||||
<ion-input autocomplete="on" autocorrect="on" spellcheck="true" placeholder="Localização" [(ngModel)]="eventProcess.workflowInstanceDataFields.Location"></ion-input>
|
||||
<ion-input autocomplete="on" autocorrect="on" spellcheck="true" placeholder="Localização*" [(ngModel)]="eventProcess.workflowInstanceDataFields.Location"></ion-input>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
<ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
|
||||
</div>
|
||||
<div class="ion-input-class flex-grow-1" [class.input-error]="Form?.get('Location')?.invalid && validateFrom ">
|
||||
<ion-input autocomplete="on" autocorrect="on" spellcheck="true" placeholder="Localização" [(ngModel)]="postEvent.Location"></ion-input>
|
||||
<ion-input autocomplete="on" autocorrect="on" spellcheck="true" placeholder="Localização*" [(ngModel)]="postEvent.Location"></ion-input>
|
||||
</div>
|
||||
</div>
|
||||
<!-- Error messages -->
|
||||
|
||||
@@ -258,7 +258,6 @@ export class EditEventPage implements OnInit {
|
||||
}
|
||||
|
||||
calculetedLastOccurrence(type:number){
|
||||
// console.log(type);
|
||||
var valor;
|
||||
var opcao: boolean;
|
||||
if (type == 0) {
|
||||
|
||||
@@ -66,7 +66,7 @@
|
||||
</div>
|
||||
|
||||
<div class="ion-input-class flex-grow-1 width-100" [class.input-error]="Form?.get('Location')?.invalid && validateFrom " >
|
||||
<ion-input autocomplete="on" autocorrect="on" spellcheck="true" type="text" placeholder="Localização" [(ngModel)]="postEvent.Location"></ion-input>
|
||||
<ion-input autocomplete="on" autocorrect="on" spellcheck="true" type="text" placeholder="Localização*" [(ngModel)]="postEvent.Location"></ion-input>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -435,7 +435,7 @@ export class NewEventPage implements OnInit {
|
||||
}
|
||||
|
||||
calculetedLastOccurrence(type:number){
|
||||
// console.log(type);
|
||||
|
||||
var valor;
|
||||
var opcao: boolean;
|
||||
if (type == 0) {
|
||||
@@ -542,7 +542,6 @@ export class NewEventPage implements OnInit {
|
||||
|
||||
},
|
||||
error => {
|
||||
console.log(error, 'error')
|
||||
loader.remove()
|
||||
this.showLoader = false
|
||||
this.hhtpErrorHandle.httpStatusHandle(error)
|
||||
@@ -670,15 +669,15 @@ export class NewEventPage implements OnInit {
|
||||
selectedCalendarId () {
|
||||
|
||||
if (this.eventService.calendarNamesType[this.CalendarName]?.['Oficial'] && this.postEvent.CalendarName == 'Oficial') {
|
||||
console.log('1')
|
||||
|
||||
return this.eventService.calendarNamesType[this.CalendarName]['OficialId']
|
||||
|
||||
} else if (this.eventService.calendarNamesType[this.CalendarName]?.['Pessoal'] && this.postEvent.CalendarName == 'Pessoal') {
|
||||
console.log('2')
|
||||
|
||||
return this.eventService.calendarNamesType[this.CalendarName]['PessoalId']
|
||||
|
||||
} else {
|
||||
console.log('1:1',this.eventService.calendarNamesType,'2', this.CalendarName)
|
||||
|
||||
return '11:11'
|
||||
}
|
||||
}
|
||||
|
||||
@@ -154,7 +154,6 @@ export class ViewEventPage implements OnInit {
|
||||
{
|
||||
text: 'Não',
|
||||
handler: () => {
|
||||
console.log('Let me think');
|
||||
}
|
||||
},
|
||||
{
|
||||
|
||||
@@ -134,7 +134,6 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
// console.log(this.roomId)
|
||||
this.loggedUser = this.loggedUserChat;
|
||||
//setTimeout(() => {
|
||||
this.getRoomInfo()
|
||||
@@ -375,7 +374,6 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
|
||||
}
|
||||
|
||||
let room = await this.chatService.getRoomInfo(this.roomId).toPromise();
|
||||
// console.log('ROOM',room)
|
||||
this.room = room['room'];
|
||||
if (this.room.name) {
|
||||
try {
|
||||
@@ -528,7 +526,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
|
||||
});
|
||||
await modal.present();
|
||||
modal.onDidDismiss().then(res => {
|
||||
console.log(res)
|
||||
|
||||
if (res.data == 'leave') {
|
||||
this.getRoomInfo();
|
||||
this.closeAllDesktopComponents.emit();
|
||||
@@ -556,8 +554,6 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
|
||||
try {
|
||||
this.roomName = res.data.name.split('-').join(' ');
|
||||
} catch (error) {
|
||||
console.log(error);
|
||||
console.log(res.data)
|
||||
this.roomName = res.data.name
|
||||
|
||||
}
|
||||
@@ -1094,8 +1090,6 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
|
||||
|
||||
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
|
||||
|
||||
console.log(msg)
|
||||
|
||||
if (msg.file.type == "application/img") {
|
||||
const modal = await this.modalController.create({
|
||||
component: ViewMediaPage,
|
||||
|
||||
@@ -385,8 +385,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
|
||||
}
|
||||
|
||||
async goToEvent(event: any) {
|
||||
console.log(event.id)
|
||||
console.log(event.calendarId)
|
||||
let classs;
|
||||
if (window.innerWidth < 701) {
|
||||
classs = 'modal modal-desktop'
|
||||
@@ -666,7 +664,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
|
||||
});
|
||||
|
||||
const blob = this.dataURItoBlob('data:image/jpeg;base64,' + file.base64String)
|
||||
console.log('data:image/jpeg;base64,' + file.base64String)
|
||||
|
||||
const formData = new FormData();
|
||||
formData.append("blobFile", blob);
|
||||
@@ -1003,7 +1000,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
|
||||
}
|
||||
|
||||
downloadFileFromBrowser(fileName: string, data: any): void {
|
||||
console.log(fileName + data)
|
||||
const linkSource = data;
|
||||
const downloadLink = document.createElement("a");
|
||||
downloadLink.href = linkSource;
|
||||
@@ -1063,9 +1059,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
|
||||
|
||||
if (this.platform.is('desktop') || this.platform.is('mobileweb')) {
|
||||
|
||||
console.log('hello')
|
||||
|
||||
console.log(msg)
|
||||
if (msg.file.type == "application/img") {
|
||||
const modal = await this.modalController.create({
|
||||
component: ViewMediaPage,
|
||||
@@ -1100,12 +1093,10 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
|
||||
this.audioPlay = new Howl({
|
||||
src: [track.changingThisBreaksApplicationSecurity],
|
||||
onplay: () => {
|
||||
console.log('audio play')
|
||||
this.isPlaying = true;
|
||||
this.updateProgress()
|
||||
},
|
||||
onend: () => {
|
||||
console.log('audio end')
|
||||
this.isPlaying = false;
|
||||
clearTimeout(this.audioTimer)
|
||||
this.audioProgress = 0
|
||||
@@ -1133,16 +1124,13 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
|
||||
updateProgress() {
|
||||
let seek = this.audioPlay.seek();
|
||||
this.audioProgress = (seek / this.audioPlay.duration()) * 100 || 0;
|
||||
console.log(this.audioDuration)
|
||||
this.audioTimer = setTimeout(() => {
|
||||
this.updateProgress()
|
||||
}, 1000)
|
||||
}
|
||||
|
||||
async getRoomInfo() {
|
||||
// this.ChatSystemService.getGroupRoom(this.roomId).loadHistory({});
|
||||
let room = await this.chatService.getRoomInfo(this.roomId).toPromise();
|
||||
// console.log('ROOM',room)
|
||||
this.room = room['room'];
|
||||
if (this.room.name) {
|
||||
try {
|
||||
|
||||
@@ -30,7 +30,7 @@ export class FingerprintPage implements OnInit {
|
||||
// localizedReason: 'Please authenticate' //Only for iOS
|
||||
// })
|
||||
// .then((FingerPrintHash: any) => {
|
||||
// console.log(FingerPrintHash)
|
||||
|
||||
|
||||
// const storedFinderPrint = localStorage.getItem('FingerPrintHash')
|
||||
// if(FingerPrintHash == storedFinderPrint) {
|
||||
@@ -39,12 +39,11 @@ export class FingerprintPage implements OnInit {
|
||||
|
||||
// })
|
||||
// .catch((error: any) => {
|
||||
// console.log(error)
|
||||
|
||||
// });
|
||||
}
|
||||
|
||||
close() {
|
||||
/* console.log(this.isEventEdited); */
|
||||
this.modalController.dismiss();
|
||||
}
|
||||
|
||||
|
||||
@@ -49,7 +49,6 @@ export class AllProcessesPage implements OnInit {
|
||||
|
||||
|
||||
setTimeout(() => {
|
||||
// console.log('this.TaskService.AllProcess', this.TaskService.AllProcess)
|
||||
// this.miniSearch.addAll(this.TaskService.AllProcess)
|
||||
// window['miniSearch'] = this.miniSearch
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
<ion-icon slot="start" src="assets/images/icons-location.svg"></ion-icon>
|
||||
</div>
|
||||
<div class="ion-input-class">
|
||||
<ion-input placeholder="Localização" [(ngModel)]="eventProcess.workflowInstanceDataFields.Location"></ion-input>
|
||||
<ion-input placeholder="Localização *" [(ngModel)]="eventProcess.workflowInstanceDataFields.Location"></ion-input>
|
||||
</div>
|
||||
</div>
|
||||
<!-- Error messages -->
|
||||
|
||||
@@ -179,12 +179,10 @@ export class EventsToApprovePage implements OnInit {
|
||||
getFromDB() {
|
||||
this.storage.get('event-to-aproveMD').then((events = []) => {
|
||||
this.eventsMDGPRList = events
|
||||
// console.log('DB',this.eventsMDGPRList)
|
||||
})
|
||||
|
||||
this.storage.get('event-to-aprovePR').then((events) => {
|
||||
this.eventsPRList = events
|
||||
// console.log('DB',this.eventsPRList)
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@@ -45,7 +45,7 @@ export class ExpedientsPage implements OnInit {
|
||||
if(event.expedienteDetail == "update") {
|
||||
this.LoadList();
|
||||
}
|
||||
console.log(event)
|
||||
|
||||
})
|
||||
|
||||
}
|
||||
|
||||
@@ -14,11 +14,16 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="upper-content">
|
||||
<div class="upper-content" >
|
||||
<div class="content-details">
|
||||
<ion-label>
|
||||
<p><span class="date">{{customDate}}</span><span class="label">{{ task.activityInstanceName }}</span></p>
|
||||
<p><span class="color-red">{{ fulltask.workflowInstanceDataFields.DeadlineType }}</span></p>
|
||||
<p><span class="date">{{customDate}}</span></p>
|
||||
</ion-label>
|
||||
<ion-label>
|
||||
<p><span class="color-red">{{ task.Deadline }}</span></p>
|
||||
</ion-label>
|
||||
<ion-label>
|
||||
<p class="d-flex mt-10"><span class="label">{{ task.activityInstanceName }}</span></p>
|
||||
</ion-label>
|
||||
</div>
|
||||
</div>
|
||||
@@ -26,7 +31,7 @@
|
||||
</ion-header>
|
||||
|
||||
<ion-content>
|
||||
<div *ngIf="task" class="overflow-y-auto" style="margin-right: -20px; margin-right: -20px;">
|
||||
<div *ngIf="task" class="overflow-y-auto height-100">
|
||||
<div class="middle-content">
|
||||
<h5 *ngIf="intervenientes">Intervenientes</h5>
|
||||
<ion-item class="ion-no-margin ion-no-padding">
|
||||
|
||||
@@ -54,7 +54,6 @@ ion-button{
|
||||
|
||||
.upper-content{
|
||||
font-family: Roboto;
|
||||
margin-top: 15px;
|
||||
margin-left: 41px;
|
||||
font-size: 18px;
|
||||
|
||||
|
||||
@@ -62,7 +62,6 @@ export class HeaderPage implements OnInit {
|
||||
if(event.notification == "recive") {
|
||||
this.notificationLengthData()
|
||||
}
|
||||
console.log(event)
|
||||
});
|
||||
|
||||
|
||||
|
||||
@@ -42,8 +42,7 @@ export class DeplomaOptionsPage implements OnInit {
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
console.log(this.fulltask)
|
||||
console.log(this.task)
|
||||
|
||||
}
|
||||
|
||||
async openAddNoteModal(actionName:string) {
|
||||
@@ -270,7 +269,7 @@ export class DeplomaOptionsPage implements OnInit {
|
||||
classs = 'modal modal-desktop showAsideOptions'
|
||||
}
|
||||
|
||||
console.log("fulltask options", this.fulltask)
|
||||
|
||||
const modal = await this.modalController.create({
|
||||
component: CreateProcessPage,
|
||||
componentProps: {
|
||||
|
||||
@@ -58,7 +58,7 @@ export class OptsExpedientePage implements OnInit {
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
console.log('SessionStore', SessionStore)
|
||||
|
||||
}
|
||||
|
||||
async openNewGroupPage(){
|
||||
|
||||
@@ -101,7 +101,6 @@ export class EditActionPage implements OnInit {
|
||||
DateEnd: this.folder.DateEnd,
|
||||
ActionType: this.folder.ActionType,
|
||||
}
|
||||
// dconsole.log(this.folder.DateEnd);
|
||||
|
||||
const loader = this.toastService.loading()
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@ import { CommonModule } from '@angular/common';
|
||||
import { FormsModule } from '@angular/forms';
|
||||
import { IonicModule } from '@ionic/angular';
|
||||
import { IonicImageLoaderModule } from 'ionic-image-loader-v5';
|
||||
import { TaskDetailsPage } from './gabinete-digital/generic/task-details/task-details.page';
|
||||
// import { HeaderPage } from './header/header.page';
|
||||
// import { HeaderPrPage } from './header-pr/header-pr.page';
|
||||
// import { BtnSeguintePage } from './btn-seguinte/btn-seguinte.page';
|
||||
@@ -30,6 +31,7 @@ import { IonicImageLoaderModule } from 'ionic-image-loader-v5';
|
||||
// EmptyChatPage,
|
||||
// BtnCriarPage,
|
||||
// BtnAdicionarPage,
|
||||
TaskDetailsPage
|
||||
],
|
||||
entryComponents:[],
|
||||
declarations: [
|
||||
|
||||
@@ -31,7 +31,7 @@ export class DespachoStoreService {
|
||||
this.keyName = (SHA1("DespachoStoreService"+ 'home/eventSource')).toString()
|
||||
window['ObjectQueryService'] = this.Query()
|
||||
|
||||
setTimeout(()=>{
|
||||
setTimeout(() => {
|
||||
let restore = localstoreService.get(this.keyName, {})
|
||||
this._list = restore.list || []
|
||||
this._count = parseInt(restore.count) || 0
|
||||
|
||||
@@ -43,11 +43,15 @@ class SessionService {
|
||||
constructor() {
|
||||
|
||||
this.keyName = (SHA1("SessionService")).toString()
|
||||
let restore = localstoreService.get(this.keyName, {})
|
||||
let restore = this.getDataFromLocalStorage()
|
||||
this._user = restore.user || new UserSession()
|
||||
|
||||
}
|
||||
|
||||
getDataFromLocalStorage() {
|
||||
return localstoreService.get(this.keyName, {})
|
||||
}
|
||||
|
||||
get user(): UserSession {
|
||||
return this._user || new UserSession()
|
||||
}
|
||||
|
||||
+4
-4
@@ -1327,19 +1327,19 @@ ngx-mat-datetime-content{
|
||||
@media only screen and (max-width: 767px) {
|
||||
.calendar-segment-mdgpr:not(.calendar-segment-pr-force) {
|
||||
.calendar-pr-event-type-Oficial {
|
||||
border-right: 3px solid transparent !important;
|
||||
// border-right: 3px solid transparent !important;
|
||||
}
|
||||
.calendar-pr-event-type-Pessoal {
|
||||
border-bottom: 3px solid transparent !important;
|
||||
// border-bottom: 3px solid transparent !important;
|
||||
}
|
||||
}
|
||||
|
||||
.calendar-segment-pr {
|
||||
.calendar-mdgpr-event-type-Pessoal {
|
||||
border-top: 3px solid transparent !important;
|
||||
// border-top: 3px solid transparent !important;
|
||||
}
|
||||
.calendar-mdgpr-event-type-Oficial {
|
||||
border-left: 3px solid transparent !important;
|
||||
// border-left: 3px solid transparent !important;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
export let versionData = {
|
||||
"shortSHA": "6f2f77db6",
|
||||
"SHA": "6f2f77db65811c219106a717aaf5f88d5c1f0c11",
|
||||
"shortSHA": "b6443b797",
|
||||
"SHA": "b6443b797e6ad266651d4755995c1d39e1f9c194",
|
||||
"branch": "feature/gabinete-search",
|
||||
"lastCommitAuthor": "'Eudes Inácio'",
|
||||
"lastCommitTime": "'Fri May 26 10:24:58 2023 +0100'",
|
||||
"lastCommitMessage": "expediente bug solved by peter",
|
||||
"lastCommitNumber": "4945",
|
||||
"lastCommitTime": "'Fri May 26 14:33:28 2023 +0100'",
|
||||
"lastCommitMessage": "envirement change",
|
||||
"lastCommitNumber": "4946",
|
||||
"change": "",
|
||||
"changeStatus": "On branch feature/gabinete-search\nYour branch is ahead of 'origin/feature/gabinete-search' by 3 commits.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: src/environments/environment.prod.ts\n\tmodified: src/environments/environment.ts",
|
||||
"changeStatus": "On branch feature/gabinete-search\nYour branch and 'origin/feature/gabinete-search' have diverged,\nand have 4 and 5 different commits each, respectively.\n (use \"git pull\" to merge the remote branch into yours)\n\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/app.component.ts\n\tmodified: src/app/guards/auth.guard.ts\n\tmodified: src/app/guards/login.guard.ts\n\tmodified: src/app/home/home.page.ts\n\tmodified: src/app/modals/create-process/create-process.page.ts\n\tmodified: src/app/modals/document-detail/document-detail.page.ts\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/modals/preview-camera/preview-camera.page.ts\n\tmodified: src/app/modals/profile/profile.page.ts\n\tmodified: src/app/modals/set-room-owner/set-room-owner.page.ts\n\tmodified: src/app/modals/view-document/view-document.page.ts\n\tmodified: src/app/modals/view-event/view-event.page.ts\n\tmodified: src/app/modals/view-media/view-media.page.ts\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.html\n\tmodified: src/app/pages/agenda/new-event/new-event.page.html\n\tmodified: src/app/pages/events/events.page.html\n\tmodified: src/app/pages/events/events.page.scss\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.module.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.html\n\tmodified: src/app/pages/gabinete-digital/diplomas/diploma/diploma.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.html\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.scss\n\tmodified: src/app/pages/gabinete-digital/event-list/event-list.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/services/auth.service.ts\n\tmodified: src/app/services/chat.service.ts\n\tmodified: src/app/services/chat/chat-system.service.ts\n\tmodified: src/app/services/chat/message.service.ts\n\tmodified: src/app/services/chat/rochet-chat-connector.service.ts\n\tmodified: src/app/services/chat/room.service.ts\n\tmodified: src/app/services/native-notification.service.ts\n\tmodified: src/app/services/network-service.service.ts\n\tmodified: src/app/services/notification/sw.js\n\tmodified: src/app/services/notifications.service.ts\n\tmodified: src/app/services/processes.service.ts\n\tmodified: src/app/services/task.service.ts\n\tmodified: src/app/shared/agenda/approve-event/approve-event.page.ts\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/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/shared/agenda/new-event/new-event.page.html\n\tmodified: src/app/shared/agenda/new-event/new-event.page.ts\n\tmodified: src/app/shared/agenda/view-event/view-event.page.ts\n\tmodified: src/app/shared/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/shared/chat/messages/messages.page.ts\n\tmodified: src/app/shared/fingerprint/fingerprint.page.ts\n\tmodified: src/app/shared/gabinete-digital/all-processes/all-processes.page.ts\n\tmodified: src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.ts\n\tmodified: src/app/shared/gabinete-digital/generic/task-details/task-details.page.html\n\tmodified: src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss\n\tmodified: src/app/shared/header/header.page.ts\n\tmodified: src/app/shared/popover/deploma-options/deploma-options.page.ts\n\tmodified: src/app/shared/popover/opts-expediente/opts-expediente.page.ts\n\tmodified: src/app/shared/publication/edit-action/edit-action.page.ts\n\tmodified: src/app/shared/shared.module.ts\n\tmodified: src/app/store/despacho-store.service.ts\n\tmodified: src/app/store/session.service.ts\n\tmodified: src/global.scss",
|
||||
"changeAuthor": "eudes.inacio"
|
||||
}
|
||||
Reference in New Issue
Block a user