From 170c5395a4b3b781b98e28f7ad0c34aa6fd5c2db Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Wed, 16 Feb 2022 13:52:32 +0100 Subject: [PATCH] save --- src/app/guards/auth.guard.ts | 4 +- src/app/modals/delegar/delegar.page.ts | 22 ++++----- src/app/pages/agenda/agenda.page.ts | 22 ++++----- src/app/pages/login/login.page.ts | 4 +- src/app/services/alert.service.ts | 4 +- src/app/services/auth.service.ts | 19 +++----- src/app/services/chat.service.ts | 4 +- .../events/edit-event/edit-event.page.ts | 48 ++++++++----------- .../event-detail-modal.page.ts | 42 +++++++--------- .../events/event-detail/event-detail.page.ts | 48 ++++++++----------- src/app/services/events/events.page.ts | 2 - .../approve-event/approve-event.page.ts | 6 --- src/app/shared/chat/messages/messages.page.ts | 5 -- .../diplomas-assinar/diplomas-assinar.page.ts | 2 - .../diplomas/diplomas.page.ts | 6 --- .../expedientes-pr/expedientes-pr.page.ts | 4 +- .../expedients/expedients.page.ts | 6 --- .../gabinete-digital/pedidos/pedidos.page.ts | 2 - .../chat-options-popover.page.ts | 26 ---------- 19 files changed, 93 insertions(+), 183 deletions(-) diff --git a/src/app/guards/auth.guard.ts b/src/app/guards/auth.guard.ts index 10a5ff3e3..d147768af 100644 --- a/src/app/guards/auth.guard.ts +++ b/src/app/guards/auth.guard.ts @@ -18,7 +18,7 @@ export class AuthGuard implements CanActivate { canActivate( route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable | Promise | boolean | UrlTree { - + // if user not active if(!SessionStore.user.Inactivity) { this.router.navigate(['/']); @@ -29,7 +29,7 @@ export class AuthGuard implements CanActivate { this.router.navigate(['/']); return false } else { - this.authService.loginChat(); + //this.authService.loginChat(); return true; } } diff --git a/src/app/modals/delegar/delegar.page.ts b/src/app/modals/delegar/delegar.page.ts index b72e269e1..a6e6391ff 100644 --- a/src/app/modals/delegar/delegar.page.ts +++ b/src/app/modals/delegar/delegar.page.ts @@ -8,7 +8,6 @@ import { EventPerson } from 'src/app/models/eventperson.model'; import { EventsService } from 'src/app/services/events.service'; import { AttachmentsService } from 'src/app/services/attachments.service'; import { DiscartExpedientModalPage } from 'src/app/pages/gabinete-digital/discart-expedient-modal/discart-expedient-modal.page'; -import { AlertService } from 'src/app/services/alert.service'; import { ToastService } from 'src/app/services/toast.service'; import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page'; import { SearchList } from 'src/app/models/search-document'; @@ -24,10 +23,10 @@ import { ThemeService } from 'src/app/services/theme.service' export class DelegarPage implements OnInit { task: any; note:string; - + taskParticipants: EventPerson[] = []; taskParticipantsCc: EventPerson[] = []; - + taskDocId:string; loadedAttachments:any; @@ -51,7 +50,6 @@ export class DelegarPage implements OnInit { private attachmentsService: AttachmentsService, private calendarService: EventsService, public alertController: AlertController, - private alertService: AlertService, private animationController: AnimationController, private toastService: ToastService, public ThemeService: ThemeService @@ -75,7 +73,7 @@ export class DelegarPage implements OnInit { ngOnInit() { this.adding = "intervenient"; console.log(this.task); - + } close() { @@ -107,8 +105,8 @@ export class DelegarPage implements OnInit { const loader = this.toastService.loading() this.processes.DelegateTask(body).subscribe(res=>{ - - console.log(res); + + console.log(res); this.toastService._successMessage('Processo delegado') this.close(); }, @@ -157,16 +155,16 @@ export class DelegarPage implements OnInit { if(this.adding == "intervenient"){ this.taskParticipants = data; } else if (this.adding == "CC") { - + this.taskParticipantsCc = data; } - + } async setIntervenient(data) { this.taskParticipants = data; } - + async setIntervenientCC(data) { this.taskParticipantsCc = data; } @@ -189,7 +187,7 @@ export class DelegarPage implements OnInit { modal.onDidDismiss(); } - + validateFormInputs(){ let formLocation = this.postData.Location.trim(); if(!this.postData.Location && formLocation.length <= 0){ @@ -229,4 +227,4 @@ export class DelegarPage implements OnInit { } -} \ No newline at end of file +} diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/pages/agenda/agenda.page.ts index a851161b5..3e9ad13a3 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/src/app/pages/agenda/agenda.page.ts @@ -4,7 +4,6 @@ import { AlertController, ModalController, Platform } from '@ionic/angular'; import { EventsService } from 'src/app/services/events.service'; import { Event } from '../../models/event.model'; import { Router, NavigationEnd } from '@angular/router'; -import { AlertService } from 'src/app/services/alert.service'; import { momentG } from 'src/plugin/momentG'; import { DomSanitizer } from "@angular/platform-browser"; import { EventPerson } from 'src/app/models/eventperson.model'; @@ -170,7 +169,6 @@ export class AgendaPage implements OnInit { private modalCtrl: ModalController, private eventService: EventsService, private router: Router, - private alertController: AlertService, private sanitizer: DomSanitizer, authService: AuthService, private dateAdapter: DateAdapter, @@ -823,10 +821,10 @@ export class AgendaPage implements OnInit { this.storage.get('agendaResponse').then((events) => { this.trasnformDataDB(events) this.updateEventListBox() - + this.myCal.update(); this.myCal.loadEvents(); - + this.showLoader = false; this.showTimeline = true; }) @@ -834,20 +832,20 @@ export class AgendaPage implements OnInit { this.sqliteservice.getAllEvents().then((events: any[]) => { console.log('ALL EVENTS FROM DB', events) let eventArray = []; - + this.trasnformDataDB(events) this.updateEventListBox() - + this.myCal.update(); this.myCal.loadEvents(); - + this.showLoader = false; this.showTimeline = true; - - + + }) } - + } updateEventListBox() { @@ -974,10 +972,6 @@ export class AgendaPage implements OnInit { }, 250) } - showAlert() { - this.alertController.presentAlert("Funcionalidade em desenvolvimento."); - } - changeProfile() { if (this.profile == "mdgpr") { diff --git a/src/app/pages/login/login.page.ts b/src/app/pages/login/login.page.ts index 9f2092bdd..37a27b44f 100644 --- a/src/app/pages/login/login.page.ts +++ b/src/app/pages/login/login.page.ts @@ -122,7 +122,9 @@ export class LoginPage implements OnInit { this.getToken(); this.router.navigateByUrl('/pin', { replaceUrl: true }); } - + } + else{ + this.toastService._badRequest('Ocorreu um problema por favor valide o username e password'); } } else { diff --git a/src/app/services/alert.service.ts b/src/app/services/alert.service.ts index 4c58508a2..48fe9d8ff 100644 --- a/src/app/services/alert.service.ts +++ b/src/app/services/alert.service.ts @@ -1,6 +1,5 @@ import { Injectable } from '@angular/core'; import { AlertController, AnimationController } from '@ionic/angular'; -import { ChatService } from './chat.service'; import { WsChatMethodsService } from './chat/ws-chat-methods.service'; import { ToastService } from './toast.service'; @@ -12,7 +11,6 @@ export class AlertService { constructor( public alertController: AlertController, private animationController: AnimationController, - private chatService: ChatService, private toastService: ToastService, public wsChatMethodsService: WsChatMethodsService, ) { } @@ -59,7 +57,7 @@ export class AlertService { text: 'Apagar', handler: () => { //const loader = this.toastService.loading(); - + this.wsChatMethodsService.deleteMessage(msgId).then(()=>{ room.deleteMessage(msgId) }) diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts index aee17f236..1331264d1 100644 --- a/src/app/services/auth.service.ts +++ b/src/app/services/auth.service.ts @@ -56,9 +56,9 @@ export class AuthService { } - if (localStorage.getItem("userChat") != null) { + /* if (localStorage.getItem("userChat") != null) { this.ValidatedUserChat = JSON.parse(localStorage.getItem('userChat')); - } + } */ } @@ -112,7 +112,7 @@ export class AuthService { //user: UserForm async loginChat() { - const expirationMinutes = 30; + /* const expirationMinutes = 30; let date = new Date().getTime(); let expirationDate = new Date(new Date().getTime() + expirationMinutes*60*1000); @@ -135,7 +135,7 @@ export class AuthService { this.presentAlert('Network error'); } - this.autoLoginChat(expirationDate.getTime() - date); + this.autoLoginChat(expirationDate.getTime() - date); */ } async autoLoginChat(expirationDate:number){ @@ -145,7 +145,7 @@ export class AuthService { } loginToChatWs() { - setTimeout(()=>{ + /* setTimeout(()=>{ this.WsChatService.connect(); this.WsChatService.login().then((message) => { @@ -189,14 +189,12 @@ export class AuthService { console.log(e) return false } - } } return false } - this.NfService.downloadFileMsg = async (message: MessageService, room?: RoomService) => { console.log('FILE TYPE', message.file.type) @@ -224,15 +222,10 @@ export class AuthService { }); return true } - return false - } }; - - - - }, 1) + }, 1) */ } autologout(expirationDate:number){ diff --git a/src/app/services/chat.service.ts b/src/app/services/chat.service.ts index d4b8512f0..e5da6103b 100644 --- a/src/app/services/chat.service.ts +++ b/src/app/services/chat.service.ts @@ -32,13 +32,13 @@ export class ChatService { private storageService:StorageService, ) { - this.loggedUserChat = authService.ValidatedUserChat; + /* this.loggedUserChat = authService.ValidatedUserChat; this.headers = new HttpHeaders(); this.headers = this.headers.set('X-User-Id', this.loggedUserChat['data'].userId); this.headers = this.headers.set('X-Auth-Token', this.loggedUserChat['data'].authToken); this.options = { headers: this.headers, - }; + }; */ } diff --git a/src/app/services/events/edit-event/edit-event.page.ts b/src/app/services/events/edit-event/edit-event.page.ts index 3a987dea9..df6574c35 100644 --- a/src/app/services/events/edit-event/edit-event.page.ts +++ b/src/app/services/events/edit-event/edit-event.page.ts @@ -7,7 +7,6 @@ import { EventBody } from 'src/app/models/eventbody.model'; import { AlertController, ModalController } from '@ionic/angular'; import { EventPerson } from 'src/app/models/eventperson.model'; import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page'; -import { AlertService } from 'src/app/services/alert.service'; import { Attachment } from 'src/app/models/attachment.model'; import { AttachmentsService } from 'src/app/services/attachments.service'; import { FormGroup, FormBuilder, Validators } from "@angular/forms"; @@ -35,19 +34,18 @@ export class EditEventPage implements OnInit { profile:string; constructor( - public formBuilder: FormBuilder, - public alertController: AlertController, - private router: Router, - private activatedRoute: ActivatedRoute, - private eventsService: EventsService, + public formBuilder: FormBuilder, + public alertController: AlertController, + private router: Router, + private activatedRoute: ActivatedRoute, + private eventsService: EventsService, private modalCtrl: ModalController, - private alertService: AlertService, private attachamentsService: AttachmentsService, private route: Router, - private iab: InAppBrowser) { + private iab: InAppBrowser) { this.loadedEvent = new Event(); this.loadedEvent.Body = new EventBody(); - + } ngOnInit() { @@ -73,7 +71,7 @@ export class EditEventPage implements OnInit { this.pageId = paramMap.get('eventId'); eventid = paramMap.get('eventId'); console.log(eventid); - + } if (paramMap.has("caller")){ this.backURL = "/home/" + paramMap.get('caller'); @@ -99,7 +97,7 @@ export class EditEventPage implements OnInit { modal.onDidDismiss().then((data) => { if (data['data'] != null) - { + { let newattendees: EventPerson[] = data['data']; this.loadedEvent.Attendees = newattendees; } @@ -142,20 +140,20 @@ export class EditEventPage implements OnInit { Delete() { - this.eventsService.deleteEvent(this.loadedEvent.EventId, 0, this.loadedEvent.CalendarName).subscribe(async () => + this.eventsService.deleteEvent(this.loadedEvent.EventId, 0, this.loadedEvent.CalendarName).subscribe(async () => { const alert = await this.alertController.create({ cssClass: 'my-custom-class', header: 'Evento removido', buttons: ['OK'] }); - + setTimeout(()=>{ alert.dismiss(); }, 1500); this.router.navigate(['/home/events']); - }); + }); } Save() @@ -165,18 +163,18 @@ export class EditEventPage implements OnInit { this.activatedRoute.paramMap.subscribe(paramMap =>{ if (paramMap.has("profile")){ console.log(paramMap.get('profile')); - + } }); - this.eventsService.editEvent(this.loadedEvent, 2, 3).subscribe(async () => + this.eventsService.editEvent(this.loadedEvent, 2, 3).subscribe(async () => { const alert = await this.alertController.create({ cssClass: 'my-custom-class', header: 'Evento actualizado', buttons: ['OK'] }); - + setTimeout(()=>{ alert.dismiss(); }, 1500); @@ -184,18 +182,14 @@ export class EditEventPage implements OnInit { } } - showAlert(){ - this.alertService.presentAlert("Funcionalidade em desenvolvimento"); - } - loadAttachments() - { + { /* console.log(this.pageId); */ - + this.attachamentsService.getAttachmentsById(this.pageId).subscribe(res => { this.loadedEventAttachments = res; console.log(res); - + }); } async viewDocument(documenturl:string) @@ -230,12 +224,12 @@ export class EditEventPage implements OnInit { cssClass: 'attachments', backdropDismiss: false }); - + await modal.present(); - + modal.onDidDismiss().then((data) => { if (data['data'] != null) - { + { let newattendees: EventPerson[] = data['data']; this.loadedEvent.Attendees = newattendees; } diff --git a/src/app/services/events/event-detail-modal/event-detail-modal.page.ts b/src/app/services/events/event-detail-modal/event-detail-modal.page.ts index efbed2dee..a813d050a 100644 --- a/src/app/services/events/event-detail-modal/event-detail-modal.page.ts +++ b/src/app/services/events/event-detail-modal/event-detail-modal.page.ts @@ -6,7 +6,6 @@ import { Attachment } from 'src/app/models/attachment.model'; import { Event } from 'src/app/models/event.model'; import { EventBody } from 'src/app/models/eventbody.model'; import { EventPerson } from 'src/app/models/eventperson.model'; -import { AlertService } from 'src/app/services/alert.service'; import { AttachmentsService } from 'src/app/services/attachments.service'; import { EventsService } from 'src/app/services/events.service'; import { AttachmentsPage } from '../attachments/attachments.page'; @@ -32,15 +31,14 @@ export class EventDetailModalPage implements OnInit { profile:string; constructor( - public formBuilder: FormBuilder, - public alertController: AlertController, - private router: Router, - private activatedRoute: ActivatedRoute, - private eventsService: EventsService, + public formBuilder: FormBuilder, + public alertController: AlertController, + private router: Router, + private activatedRoute: ActivatedRoute, + private eventsService: EventsService, private modalCtrl: ModalController, - private alertService: AlertService, private attachamentsService: AttachmentsService, - private route: Router,) { + private route: Router,) { this.loadedEvent = new Event(); this.loadedEvent.Body = new EventBody(); } @@ -75,7 +73,7 @@ export class EventDetailModalPage implements OnInit { this.pageId = paramMap.get('eventId'); eventid = paramMap.get('eventId'); console.log(eventid); - + } if (paramMap.has("caller")){ this.backURL = "/home/" + paramMap.get('caller'); @@ -101,7 +99,7 @@ export class EventDetailModalPage implements OnInit { modal.onDidDismiss().then((data) => { if (data['data'] != null) - { + { let newattendees: EventPerson[] = data['data']; this.loadedEvent.Attendees = newattendees; } @@ -144,35 +142,35 @@ export class EventDetailModalPage implements OnInit { Delete() { - this.eventsService.deleteEvent(this.loadedEvent.EventId, 0, this.loadedEvent.CalendarName).subscribe(async () => + this.eventsService.deleteEvent(this.loadedEvent.EventId, 0, this.loadedEvent.CalendarName).subscribe(async () => { const alert = await this.alertController.create({ cssClass: 'my-custom-class', header: 'Evento removido', buttons: ['OK'] }); - + setTimeout(()=>{ alert.dismiss(); }, 1500); this.router.navigate(['/home/events']); - }); + }); } Save() { - if (this.ionicForm.valid) + if (this.ionicForm.valid) { - this.eventsService.putEvent(this.loadedEvent, 2, 3, "md").subscribe(async () => + this.eventsService.putEvent(this.loadedEvent, 2, 3, "md").subscribe(async () => { const alert = await this.alertController.create({ cssClass: 'my-custom-class', header: 'Evento actualizado', buttons: ['OK'] }); - + setTimeout(()=>{ alert.dismiss(); }, 1500); @@ -180,21 +178,17 @@ export class EventDetailModalPage implements OnInit { } } - showAlert(){ - this.alertService.presentAlert("Funcionalidade em desenvolvimento"); - } - loadAttachments() - { + { /* this.attachamentsService.getEventAttachments(this.pageId).subscribe(attachments => { this.loadedEventAttachments = attachments; }); */ this.attachamentsService.getAttachmentsById(this.pageId).subscribe(res => { console.log(res); - + },(error) => { console.log(error); - + }); } async viewDocument(documenturl:string) @@ -234,7 +228,7 @@ export class EventDetailModalPage implements OnInit { modal.onDidDismiss().then((data) => { if (data['data'] != null) - { + { let newattendees: EventPerson[] = data['data']; this.loadedEvent.Attendees = newattendees; } diff --git a/src/app/services/events/event-detail/event-detail.page.ts b/src/app/services/events/event-detail/event-detail.page.ts index 9429e9222..67858c507 100644 --- a/src/app/services/events/event-detail/event-detail.page.ts +++ b/src/app/services/events/event-detail/event-detail.page.ts @@ -7,7 +7,6 @@ import { EventBody } from 'src/app/models/eventbody.model'; import { AlertController, ModalController } from '@ionic/angular'; import { EventPerson } from 'src/app/models/eventperson.model'; import { AttendeesPageModal } from 'src/app/pages/events/attendees/attendees.page'; -import { AlertService } from 'src/app/services/alert.service'; import { Attachment } from 'src/app/models/attachment.model'; import { AttachmentsService } from 'src/app/services/attachments.service'; import { FormGroup, FormBuilder, Validators } from "@angular/forms"; @@ -36,16 +35,15 @@ export class EventDetailPage implements OnInit { constructor( - public formBuilder: FormBuilder, - public alertController: AlertController, - private router: Router, - private activatedRoute: ActivatedRoute, - private eventsService: EventsService, + public formBuilder: FormBuilder, + public alertController: AlertController, + private router: Router, + private activatedRoute: ActivatedRoute, + private eventsService: EventsService, private modalCtrl: ModalController, - private alertService: AlertService, private attachamentsService: AttachmentsService, private route: Router, - private iab: InAppBrowser) { + private iab: InAppBrowser) { this.loadedEvent = new Event(); this.loadedEvent.Body = new EventBody(); } @@ -73,7 +71,7 @@ export class EventDetailPage implements OnInit { this.pageId = paramMap.get('eventId'); eventid = paramMap.get('eventId'); console.log(eventid); - + } if (paramMap.has("caller")){ this.backURL = "/home/" + paramMap.get('caller'); @@ -99,7 +97,7 @@ export class EventDetailPage implements OnInit { modal.onDidDismiss().then((data) => { if (data['data'] != null) - { + { let newattendees: EventPerson[] = data['data']; this.loadedEvent.Attendees = newattendees; } @@ -142,18 +140,18 @@ export class EventDetailPage implements OnInit { Delete() { - this.eventsService.deleteEvent(this.loadedEvent.EventId, 0, this.loadedEvent.CalendarName).subscribe(async () => + this.eventsService.deleteEvent(this.loadedEvent.EventId, 0, this.loadedEvent.CalendarName).subscribe(async () => { /* const alert = await this.alertController.create({ cssClass: 'my-custom-class', header: 'Evento removido', buttons: ['OK'] }); - + await alert.present(); */ this.router.navigate(['/home/events']); - }); + }); } Save() @@ -163,18 +161,18 @@ export class EventDetailPage implements OnInit { this.activatedRoute.paramMap.subscribe(paramMap =>{ if (paramMap.has("profile")){ console.log(paramMap.get('profile')); - + } }); - this.eventsService.editEvent(this.loadedEvent, 2, 3).subscribe(async () => + this.eventsService.editEvent(this.loadedEvent, 2, 3).subscribe(async () => { const alert = await this.alertController.create({ cssClass: 'my-custom-class', header: 'Evento actualizado', buttons: ['OK'] }); - + setTimeout(()=>{ alert.dismiss(); }, 1500); @@ -182,18 +180,14 @@ export class EventDetailPage implements OnInit { } } - showAlert(){ - this.alertService.presentAlert("Funcionalidade em desenvolvimento"); - } - loadAttachments() - { + { /* console.log(this.pageId); */ - + this.attachamentsService.getAttachmentsById(this.pageId).subscribe(res => { this.loadedEventAttachments = res; console.log(res); - + }); } async viewDocument(documenturl:string) @@ -228,17 +222,17 @@ export class EventDetailPage implements OnInit { cssClass: 'attachments', backdropDismiss: false }); - + await modal.present(); - + modal.onDidDismiss().then((data) => { if (data['data'] != null) - { + { let newattendees: EventPerson[] = data['data']; this.loadedEvent.Attendees = newattendees; } }); } - + } diff --git a/src/app/services/events/events.page.ts b/src/app/services/events/events.page.ts index 079667c84..0bf1ea61c 100644 --- a/src/app/services/events/events.page.ts +++ b/src/app/services/events/events.page.ts @@ -4,7 +4,6 @@ import { Event } from '../../models/event.model'; import { EventsService } from 'src/app/services/events.service'; import { NavigationExtras, Router } from '@angular/router'; import { ActivatedRoute, NavigationEnd } from '@angular/router'; -import { AlertService } from 'src/app/services/alert.service'; import { AuthService } from 'src/app/services/auth.service'; import { StorageService } from 'src/app/services/storage.service'; import { ModalController, Platform } from '@ionic/angular'; @@ -78,7 +77,6 @@ export class EventsPage implements OnInit { private router: Router, private storageService:StorageService, public activatedRoute: ActivatedRoute, - private alertController: AlertService, private authService: AuthService, private processes:ProcessesService, /* private gabineteService: GabineteDigitalPage, */ diff --git a/src/app/shared/agenda/approve-event/approve-event.page.ts b/src/app/shared/agenda/approve-event/approve-event.page.ts index c94d7daef..2e8985617 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.ts +++ b/src/app/shared/agenda/approve-event/approve-event.page.ts @@ -2,7 +2,6 @@ import { Component, OnInit, Input, EventEmitter, Output } from '@angular/core'; import { NavigationExtras, Router } from '@angular/router'; import { ModalController, PopoverController } from '@ionic/angular'; import { Event } from 'src/app/models/event.model'; -import { AlertService } from 'src/app/services/alert.service'; import { AttachmentsService } from 'src/app/services/attachments.service'; import { ProcessesService } from 'src/app/services/processes.service'; import { EmendMessageModalPage } from 'src/app/pages/agenda/emend-message-modal/emend-message-modal.page'; @@ -47,7 +46,6 @@ export class ApproveEventPage implements OnInit { private processes:ProcessesService, private attachmentsService: AttachmentsService, private popoverController: PopoverController, - private alertService: AlertService, private iab: InAppBrowser, private toastService: ToastService, public ThemeService: ThemeService @@ -81,10 +79,6 @@ export class ApproveEventPage implements OnInit { } */ - notImplemented() { - this.alertService.presentAlert('Funcionalidade em desenvolvimento'); - } - close() { /* this.router.navigate(['/home/gabinete-digital/event-list']); */ this.closeEventToApprove.emit(); diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts index 2b0328b67..5ea2e231b 100644 --- a/src/app/shared/chat/messages/messages.page.ts +++ b/src/app/shared/chat/messages/messages.page.ts @@ -150,11 +150,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy }); } - - notImplemented() { - this.alertService.presentAlert('Funcionalidade em desenvolvimento'); - } - load = () => { this.checktimeOut = true; this.getChatMembers(); diff --git a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts index 047ba3e66..7c5f017f8 100644 --- a/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts +++ b/src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.ts @@ -3,7 +3,6 @@ import { NavigationStart, Router } from '@angular/router'; import { customTask, DailyWorkTask } from '../../../models/dailyworktask.model'; import { ProcessesService } from 'src/app/services/processes.service'; import { ModalController } from '@ionic/angular'; -import { AlertService } from 'src/app/services/alert.service'; import { DeplomasStore } from 'src/app/store/deplomas.service'; import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe'; import { SortService } from 'src/app/services/functions/sort.service'; @@ -27,7 +26,6 @@ export class DiplomasAssinarPage implements OnInit { constructor( private processes:ProcessesService, private modalController: ModalController, - private alertService: AlertService, private router: Router, private sortService: SortService, public ThemeService: ThemeService diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts index b46dc541c..5e2264b06 100644 --- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts +++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.ts @@ -3,7 +3,6 @@ import { ActivatedRoute, NavigationEnd, NavigationExtras, NavigationStart, Route import { DailyWorkTask } from '../../../models/dailyworktask.model'; import { ProcessesService } from 'src/app/services/processes.service'; import { ModalController, NavParams } from '@ionic/angular'; -import { AlertService } from 'src/app/services/alert.service'; import { removeDuplicate } from 'src/plugin/removeDuplicate.js' import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe'; import { DeplomasStore } from 'src/app/store/deplomas.service'; @@ -32,7 +31,6 @@ customTaskPipe = new CustomTaskPipe() constructor( private processes:ProcessesService, private modalController: ModalController, - private alertService: AlertService, private router: Router, private activatedRoute: ActivatedRoute, public ThemeService: ThemeService, @@ -64,10 +62,6 @@ constructor( this.router.navigate(['/home/gabinete-digital/diplomas', serialNumber, 'gabinete-digital']); } - notImplemented(){ - this.alertService.presentAlert('Funcionalidade em desenvolvimento'); - } - async LoadList() { this.skeletonLoader = true; diff --git a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts index fc6b10e54..843db5601 100644 --- a/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts +++ b/src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.ts @@ -3,7 +3,6 @@ import { NavigationStart, Router } from '@angular/router'; import { customTask, DailyWorkTask } from '../../../models/dailyworktask.model'; import { ProcessesService } from 'src/app/services/processes.service'; import { ModalController } from '@ionic/angular'; -import { AlertService } from 'src/app/services/alert.service'; import { LoginUserRespose } from 'src/app/models/user.model'; import { AuthService } from 'src/app/services/auth.service'; import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe'; @@ -33,7 +32,6 @@ export class ExpedientesPrPage implements OnInit { constructor( private processes:ProcessesService, private modalController: ModalController, - private alertService: AlertService, private authService: AuthService, private router: Router, public ThemeService: ThemeService, @@ -77,7 +75,7 @@ export class ExpedientesPrPage implements OnInit { let task = this.expedienteTaskPipe.transform(element); this.taskslist.push(task); }); - + this.taskslist = this.sortService.sortDate(this.taskslist, 'CreateDate') this.expedienteGdStore.reset(this.taskslist); diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts index 8c5696320..3f9eb25a7 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts @@ -1,7 +1,6 @@ import { Component, Input, OnInit } from '@angular/core'; import { NavigationStart, Router } from '@angular/router'; import { ProcessesService } from 'src/app/services/processes.service'; -import { AlertService } from 'src/app/services/alert.service'; import { ExpedienteGdStore } from 'src/app/store/expedientegd-store.service'; import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe'; import { ThemeService } from 'src/app/services/theme.service' @@ -27,7 +26,6 @@ export class ExpedientsPage implements OnInit { constructor( private processes: ProcessesService, - private alertService: AlertService, private router: Router, public ThemeService: ThemeService, private sortService: SortService, @@ -59,10 +57,6 @@ export class ExpedientsPage implements OnInit { this.LoadList(); } - notImplemented() { - this.alertService.presentAlert('Funcionalidade em desenvolvimento'); - } - LoadList() { this.skeletonLoader = true diff --git a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts index a09f07014..cfd9fc9d1 100644 --- a/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts +++ b/src/app/shared/gabinete-digital/pedidos/pedidos.page.ts @@ -4,7 +4,6 @@ import { CalendarComponent } from 'ionic2-calendar'; import { customTask, DailyWorkTask } from '../../../models/dailyworktask.model'; import { ProcessesService } from 'src/app/services/processes.service'; import { ModalController } from '@ionic/angular'; -import { AlertService } from 'src/app/services/alert.service'; import { PedidoPage } from 'src/app/pages/gabinete-digital/pedidos/pedido/pedido.page'; import { PedidosStore } from 'src/app/store/pedidos-store.service'; import { CustomTaskPipe } from 'src/app/pipes/custom-task.pipe'; @@ -45,7 +44,6 @@ export class PedidosPage implements OnInit { private router: Router, private processes:ProcessesService, private modalController: ModalController, - private alertService: AlertService, private sortService: SortService, public ThemeService: ThemeService ) { diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts index c0d566d76..db75f4b19 100644 --- a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts +++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts @@ -4,7 +4,6 @@ import { EventPerson } from 'src/app/models/eventperson.model'; import { SearchList } from 'src/app/models/search-document'; import { NewEventPage } from 'src/app/pages/agenda/new-event/new-event.page'; import { SearchPage } from 'src/app/pages/search/search.page'; -import { AlertService } from 'src/app/services/alert.service'; import { environment } from 'src/environments/environment'; import { ThemeService } from 'src/app/services/theme.service' @@ -22,7 +21,6 @@ export class ChatOptionsPopoverPage implements OnInit { constructor( private popoverController: PopoverController, private modalController: ModalController, - private alertService: AlertService, private navParams: NavParams, public ThemeService: ThemeService ) { @@ -43,10 +41,6 @@ export class ChatOptionsPopoverPage implements OnInit { } - notImplemented(){ - this.alertService.presentAlert('Funcionalidade em desenvolvimento'); - } - takePicture(){ if( window.innerWidth < 701){ this.popoverController.dismiss('take-picture'); @@ -97,26 +91,6 @@ export class ChatOptionsPopoverPage implements OnInit { } - /* getGroupContacts(room:any){ - this.showLoader = true; - //If group is private call getGroupMembers - if(this.room.t === 'p'){ - this.chatService.getGroupMembers(this.roomId).subscribe(res=>{ - console.log(res); - this.members = res['members']; - this.showLoader = false; - }); - } - //Otherwise call getChannelMembers for públic groups - else{ - this.chatService.getChannelMembers(this.roomId).subscribe(res=>{ - console.log(res); - this.members = res['members']; - this.showLoader = false; - }); - } - } */ - async getDoc(){ const modal = await this.modalController.create({