From ac1f01b15b042162bee58c4d23ee56c1070553b6 Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Mon, 21 Oct 2024 10:15:48 +0100 Subject: [PATCH] remove uunsed --- src/app/Rules/aprove-event.service.spec.ts | 16 -- src/app/Rules/aprove-event.service.ts | 51 ----- src/app/app-routing.module.ts | 4 - src/app/home/home.page.ts | 2 - .../chat-options-features-routing.module.ts | 17 -- .../chat-options-features.module.ts | 20 -- .../chat-options-features.page.html | 19 -- .../chat-options-features.page.scss | 50 ---- .../chat-options-features.page.spec.ts | 24 -- .../chat-options-features.page.ts | 216 ------------------ .../document-set-up-meeting.page.ts | 4 - src/app/modals/forward/forward.page.ts | 24 +- src/app/module/agenda/utils.ts | 15 -- src/app/pages/events/events.page.ts | 2 - .../approve-event/approve-event.page.ts | 3 - .../event-list/event-list.page.ts | 2 - .../book-meeting-modal.page.ts | 3 - .../gabinete-digital/gabinete-digital.page.ts | 2 - src/app/services/auth.service.ts | 10 - src/app/services/events.service.ts | 4 +- .../services/hardware-go-back.service.spec.ts | 16 -- src/app/services/hardware-go-back.service.ts | 9 - src/app/services/notifications.service.ts | 7 +- .../services/offline-manager.service.spec.ts | 16 -- src/app/services/offline-manager.service.ts | 43 ---- src/app/services/rules/event.service.ts | 2 - src/app/services/task.service.ts | 2 - .../events-to-approve.page.ts | 2 - .../expedients/expedients.page.ts | 1 - src/app/ui/agenda/agenda.page.ts | 2 - .../approve-event/approve-event.page.ts | 2 - .../edit-event-to-approve.page.ts | 9 - .../component/event-list/event-list.page.ts | 2 - .../component/new-event/new-event.page.ts | 2 - .../component/view-event/view-event.page.ts | 61 ----- .../modal/edit-event/edit-event.page.ts | 2 - .../agenda/modal/new-event/new-event.page.ts | 2 - .../modal/view-event/view-event.page.ts | 2 - .../chat/component/messages/messages.page.ts | 83 ------- version/git-version.ts | 12 +- 40 files changed, 21 insertions(+), 744 deletions(-) delete mode 100644 src/app/Rules/aprove-event.service.spec.ts delete mode 100644 src/app/Rules/aprove-event.service.ts delete mode 100644 src/app/modals/chat-options-features/chat-options-features-routing.module.ts delete mode 100644 src/app/modals/chat-options-features/chat-options-features.module.ts delete mode 100644 src/app/modals/chat-options-features/chat-options-features.page.html delete mode 100644 src/app/modals/chat-options-features/chat-options-features.page.scss delete mode 100644 src/app/modals/chat-options-features/chat-options-features.page.spec.ts delete mode 100644 src/app/modals/chat-options-features/chat-options-features.page.ts delete mode 100644 src/app/services/hardware-go-back.service.spec.ts delete mode 100644 src/app/services/hardware-go-back.service.ts delete mode 100644 src/app/services/offline-manager.service.spec.ts delete mode 100644 src/app/services/offline-manager.service.ts diff --git a/src/app/Rules/aprove-event.service.spec.ts b/src/app/Rules/aprove-event.service.spec.ts deleted file mode 100644 index 493903aa2..000000000 --- a/src/app/Rules/aprove-event.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { AproveEventService } from './aprove-event.service'; - -describe('AproveEventService', () => { - let service: AproveEventService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(AproveEventService); - }); - - it('should be created', () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/src/app/Rules/aprove-event.service.ts b/src/app/Rules/aprove-event.service.ts deleted file mode 100644 index 2e860a1ea..000000000 --- a/src/app/Rules/aprove-event.service.ts +++ /dev/null @@ -1,51 +0,0 @@ -import { Injectable } from '@angular/core'; -import { ProcessesService } from '../services/processes.service'; -import { SessionStore } from '../store/session.service'; -import { ProcessDocumentService } from './process-document.service'; -import { LoaderService } from 'src/app/store/loader.service' - -@Injectable({ - providedIn: 'root' -}) -export class AproveEventService { - - loader = this.LoaderService.initialize("AproveEventService") - - constructor( - private processes: ProcessesService, - private processDocumentService: ProcessDocumentService, - public LoaderService: LoaderService, - ) { } - - - async GetTasksListEventosMD() { - this.loader.push() - - try { - let mdEventsOficial = await this.processes.GetTasksList('Agenda Oficial MDGPR', false).toPromise(); - let mdEventsPessoal = await this.processes.GetTasksList('Agenda Pessoal MDGPR', false).toPromise(); - let eventsMDGPRList = mdEventsOficial.concat(mdEventsPessoal); - - // eventsMDGPRList = eventsMDGPRList.filter((item) => item.activityInstanceName != 'Editar Evento') - this.loader.pop() - return eventsMDGPRList - } catch (error) { - this.loader.pop() - return [] - } - - } - - async GetTasksListEventosPR() { - try { - let prEventsOficial = await this.processes.GetTasksList('Agenda Oficial PR,Agenda Pessoal PR', false).toPromise(); - let eventsPRList = prEventsOficial - // eventsPRList = eventsPRList.filter((item) => item.activityInstanceName != 'Editar Evento') - - return eventsPRList; - } catch (error) { - return [] - } - - } -} diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 37d7c5f9d..c1f939406 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -162,10 +162,6 @@ const routes = [ path: 'task-details', loadChildren: () => import('./shared/gabinete-digital/generic/task-details/task-details.module').then( m => m.TaskDetailsPageModule) }, - { - path: 'chat-options-features', - loadChildren: () => import('./modals/chat-options-features/chat-options-features.module').then( m => m.ChatOptionsFeaturesPageModule) - }, { path: 'document-viewer', loadChildren: () => import('./modals/document-viewer/document-viewer.module').then( m => m.DocumentViewerPageModule) diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index bdb238296..2192335ca 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -9,7 +9,6 @@ import { SessionStore } from '../store/session.service'; import { PermissionService } from '../services/permission.service'; import { BackgroundService } from 'src/app/services/background.service'; import { Storage } from '@ionic/storage'; -import { EventsService } from 'src/app/services/events.service'; // import { RochetChatConnectorService } from 'src/app/services/chat/rochet-chat-connector.service'; import { ProcessesService } from 'src/app/services/processes.service'; import { RoleIdService } from 'src/app/services/role-id.service'; @@ -93,7 +92,6 @@ export class HomePage implements OnInit { public RouteService: RouteService, // private RochetChatConnectorService: RochetChatConnectorService, private NetworkServiceService: NetworkServiceService, - public eventService: EventsService, public ActiveTabService: ActiveTabService, private RoleIdService: RoleIdService, private zone: NgZone, diff --git a/src/app/modals/chat-options-features/chat-options-features-routing.module.ts b/src/app/modals/chat-options-features/chat-options-features-routing.module.ts deleted file mode 100644 index 84c99e3e5..000000000 --- a/src/app/modals/chat-options-features/chat-options-features-routing.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { NgModule } from '@angular/core'; -import { Routes, RouterModule } from '@angular/router'; - -import { ChatOptionsFeaturesPage } from './chat-options-features.page'; - -const routes: Routes = [ - { - path: '', - component: ChatOptionsFeaturesPage - } -]; - -@NgModule({ - imports: [RouterModule.forChild(routes)], - exports: [RouterModule], -}) -export class ChatOptionsFeaturesPageRoutingModule {} diff --git a/src/app/modals/chat-options-features/chat-options-features.module.ts b/src/app/modals/chat-options-features/chat-options-features.module.ts deleted file mode 100644 index 625164a28..000000000 --- a/src/app/modals/chat-options-features/chat-options-features.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { IonicModule } from '@ionic/angular'; - -import { ChatOptionsFeaturesPageRoutingModule } from './chat-options-features-routing.module'; - -import { ChatOptionsFeaturesPage } from './chat-options-features.page'; - -@NgModule({ - imports: [ - CommonModule, - FormsModule, - IonicModule, - ChatOptionsFeaturesPageRoutingModule - ], - declarations: [ChatOptionsFeaturesPage] -}) -export class ChatOptionsFeaturesPageModule {} diff --git a/src/app/modals/chat-options-features/chat-options-features.page.html b/src/app/modals/chat-options-features/chat-options-features.page.html deleted file mode 100644 index a0c3cacdc..000000000 --- a/src/app/modals/chat-options-features/chat-options-features.page.html +++ /dev/null @@ -1,19 +0,0 @@ - -
- -
-
- - - - -
- - -
- - diff --git a/src/app/modals/chat-options-features/chat-options-features.page.scss b/src/app/modals/chat-options-features/chat-options-features.page.scss deleted file mode 100644 index 52589ea7c..000000000 --- a/src/app/modals/chat-options-features/chat-options-features.page.scss +++ /dev/null @@ -1,50 +0,0 @@ -@import '~src/function.scss'; - -.container{ - --padding-top:20px !important; - --padding-bottom:20px !important; - --padding-start:20px !important; - --padding-end:20px !important; -} -.arrow-right{ - display: none; - margin-bottom: 20px; - .arrow-right-icon{ - width: 37px; - float: right; - font-size: rem(35); - overflow: hidden; - } -} -.buttons{ - display: flex; - flex-wrap: wrap; - justify-content: space-between; - - .btn-ok, .btn-cancel, .btn-delete{ - margin-bottom: 10px !important; - } -} -.solid { - display: none; - width: 90%; - border-top: 1px solid #bbb; - margin: 0 auto !important; - margin-bottom: 10px; -} -@media only screen and (min-width: 701px) { - .arrow-right{ - display: flex; - justify-content: flex-end; - } - .btn-cancel{ - width: 100% !important; - } - .btn-cancel:hover{ - background-color: var(--button-hover); - color: #fff !important; - } - .mobile-only{ - display: none !important; - } -} diff --git a/src/app/modals/chat-options-features/chat-options-features.page.spec.ts b/src/app/modals/chat-options-features/chat-options-features.page.spec.ts deleted file mode 100644 index 9d5b4b02d..000000000 --- a/src/app/modals/chat-options-features/chat-options-features.page.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; -import { IonicModule } from '@ionic/angular'; - -import { ChatOptionsFeaturesPage } from './chat-options-features.page'; - -describe('ChatOptionsFeaturesPage', () => { - let component: ChatOptionsFeaturesPage; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ ChatOptionsFeaturesPage ], - imports: [IonicModule.forRoot()] - }).compileComponents(); - - fixture = TestBed.createComponent(ChatOptionsFeaturesPage); - component = fixture.componentInstance; - fixture.detectChanges(); - })); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/modals/chat-options-features/chat-options-features.page.ts b/src/app/modals/chat-options-features/chat-options-features.page.ts deleted file mode 100644 index 20a99db2c..000000000 --- a/src/app/modals/chat-options-features/chat-options-features.page.ts +++ /dev/null @@ -1,216 +0,0 @@ -import { Component, OnInit } from '@angular/core'; -import { ModalController, NavParams, PopoverController } from '@ionic/angular'; -import { EventPerson } from 'src/app/models/eventperson.model'; -import { SearchList } from 'src/app/models/search-document'; -import { NewEventPage } from 'src/app/ui/agenda/modal/new-event/new-event.page'; -import { SearchPage } from 'src/app/pages/search/search.page'; -import { AlertService } from 'src/app/services/alert.service'; -import { FileLoaderService } from 'src/app/services/file/file-loader.service'; -import { FileToBase64Service } from 'src/app/services/file/file-to-base64.service'; -import { environment } from 'src/environments/environment'; -import { ThemeService } from 'src/app/services/theme.service' -import { HttpErrorResponse } from '@angular/common/http'; - -@Component({ - selector: 'app-chat-options-features', - templateUrl: './chat-options-features.page.html', - styleUrls: ['./chat-options-features.page.scss'], -}) -export class ChatOptionsFeaturesPage implements OnInit { - - documents:SearchList[] = []; - members: any; - attendees: EventPerson[] = []; - - capturedImage:any; - capturedImageTitle:any; - - constructor( - private popoverController: PopoverController, - private modalController: ModalController, - private alertService: AlertService, - private navParams: NavParams, - private fileLoaderService: FileLoaderService, - private fileToBase64Service: FileToBase64Service, - public ThemeService: ThemeService - ) { - - this.members = this.navParams.get('members'); - this.attendees = this.members.map((val)=>{ - return { - Name: val.name, - EmailAddress: val.username+"@"+environment.domain, - IsRequired: "true", - } - }); - } - - ngOnInit() { - // this.chatService.refreshtoken(); - } - - notImplemented() { - this.alertService.presentAlert('Funcionalidade em desenvolvimento'); - } - - close() { - if( window.innerWidth < 701) { - this.popoverController.dismiss(); - } - else { - this.modalController.dismiss(); - } - } - - attachDocument(){ - - } - - addDocument(){ - this.modalController.dismiss('add-document'); - } - - takePicture(){ - if( window.innerWidth < 701){ - this.popoverController.dismiss('take-picture'); - } - else{ - this.modalController.dismiss('take-picture'); - } - } - - addPicture(){ - this.modalController.dismiss('add-picture'); - } - - addDocGestaoDocumental(){ - this.modalController.dismiss('documentoGestaoDocumental'); - } - - laodPicture() { - const input = this.fileLoaderService.createInput({ - accept: ['image/apng', 'image/jpeg', 'image/png'] - }) - - input.onchange = async () => { - const file = this.fileLoaderService.getFirstFile(input) - - - let imageData; - try { - imageData = await this.fileToBase64Service.convert(file) - } catch (error) { - console.error('load picture chat',error) - } - this.capturedImage = imageData; - this.capturedImageTitle = file.name; - - let body = { - "message": - { - "rid": "J5WDHyrYWHQrybbno", - "msg": "this.message", - "attachments": [{ - "title": this.capturedImageTitle , - "text": "description", - "title_link_download": false, - "image_url": this.capturedImage, - }] - } - } - - - // - }; - } - - sendMessage(){ - let body = { - "message": - { - "rid": "J5WDHyrYWHQrybbno", - "msg": "this.message", - /* "attachments": [{ - "color": "#ff0000", - "text": "Yay for gruggy!", - "title": "Attachment Example", - "title_link": "https://youtube.com", - "title_link_download": false, - "image_url": "https://upload.wikimedia.org/wikipedia/commons/e/ee/Chain_link_icon.png", - }] */ - } - } - - - } - - /* getGroupContacts(room:any){ - this.showLoader = true; - //If group is private call getGroupMembers - if(this.room.t === 'p'){ - this.chatService.getGroupMembers(this.roomId).subscribe(res=>{ - - this.members = res['members']; - this.showLoader = false; - }); - } - //Otherwise call getChannelMembers for públic groups - else{ - this.chatService.getChannelMembers(this.roomId).subscribe(res=>{ - - this.members = res['members']; - this.showLoader = false; - }); - } - } */ - - async getDoc(){ - const modal = await this.modalController.create({ - component: SearchPage, - cssClass: 'group-messages modal-desktop search-modal search-modal-to-desktop', - componentProps: { - type: 'AccoesPresidenciais & ArquivoDespachoElect', - select: true, - showSearchInput: true, - } - }); - await modal.present(); - modal.onDidDismiss().then((res)=>{ - if(res){ - const data = res.data; - this.documents.push(data.selected); - } - }, (error) => { - console.log(error) - }); - } - - async bookMeeting() { - - if( window.innerWidth <= 800){ - this.popoverController.dismiss(); - const modal = await this.modalController.create({ - component: NewEventPage, - componentProps:{ - attendees: this.attendees, - }, - cssClass: 'modal modal-desktop', - backdropDismiss: false - }); - - modal.onDidDismiss().then((data) => { - if(data){ - - } - }, (error) => { - console.log(error) - }); - - await modal.present(); - } - else{ - this.modalController.dismiss('meeting'); - } - } - -} diff --git a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts index c71d0533a..669b59952 100644 --- a/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts +++ b/src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts @@ -14,8 +14,6 @@ import * as _moment from 'moment'; import * as _rollupMoment from 'moment'; import { NgxMatDateFormats } from '@angular-material-components/datetime-picker'; import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker'; -import { EventsService } from 'src/app/services/events.service'; -import { EventService } from 'src/app/services/rules/event.service'; import { EventPipe } from 'src/app/pipes/event.pipe'; import { ThemeService } from 'src/app/services/theme.service'; import { SessionStore } from 'src/app/store/session.service'; @@ -122,9 +120,7 @@ export class DocumentSetUpMeetingPage implements OnInit { private router: Router, private navParams: NavParams, private toastService: ToastService, - private calendarService: EventsService, public ThemeService: ThemeService, - public _eventService: EventsService, private httpErroHandle: HttpErrorHandle, public TaskService: TaskService, private agendaDataRepository: AgendaDataRepositoryService, diff --git a/src/app/modals/forward/forward.page.ts b/src/app/modals/forward/forward.page.ts index a75e620c9..799ae600d 100644 --- a/src/app/modals/forward/forward.page.ts +++ b/src/app/modals/forward/forward.page.ts @@ -5,7 +5,6 @@ import { Event } from 'src/app/models/event.model' import { EventBody } from 'src/app/models/eventbody.model'; import { ProcessesService } from 'src/app/services/processes.service'; 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'; @@ -27,10 +26,10 @@ import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; export class ForwardPage implements OnInit { task: any; note:string; - + taskParticipants: EventPerson[] = []; taskParticipantsCc: EventPerson[] = []; - + taskDocId:string; loadedAttachments:any; @@ -51,7 +50,6 @@ export class ForwardPage implements OnInit { private navParams: NavParams, private processes:ProcessesService, private attachmentsService: AttachmentsService, - private calendarService: EventsService, public alertController: AlertController, private alertService: AlertService, private animationController: AnimationController, @@ -70,7 +68,7 @@ export class ForwardPage implements OnInit { ngOnInit() { this.adding = "intervenient"; - + } close() { @@ -96,8 +94,8 @@ export class ForwardPage implements OnInit { } async assignar(note:string, documents:any) { - let body = { - "serialNumber": this.task.SerialNumber, + let body = { + "serialNumber": this.task.SerialNumber, "action": "Reencaminhar", "ActionTypeId": 98, "dataFields": { @@ -106,7 +104,7 @@ export class ForwardPage implements OnInit { "AttachmentList" :documents, } } - + notImplemented(){ this.alertService.presentAlert('Funcionalidade em desenvolvimento'); } @@ -123,7 +121,7 @@ export class ForwardPage implements OnInit { ProcessInstanceID: "", Attachments: DocumentToSave, } - + if(this.taskParticipants.length < 1){ this.toastService._badRequest("Selecione um destinatário"); } @@ -196,11 +194,11 @@ export class ForwardPage implements OnInit { async setIntervenient(data) { this.taskParticipants = data; } - + async setIntervenientCC(data) { this.taskParticipantsCc = data; } - + validateFormInputs(){ let formLocation = this.postData.Location.trim(); if(!this.postData.Location && formLocation.length <= 0){ @@ -212,7 +210,7 @@ export class ForwardPage implements OnInit { this.taskParticipants = taskParticipants; } - + async getDoc() { const modal = await this.modalController.create({ @@ -244,4 +242,4 @@ export class ForwardPage implements OnInit { -} \ No newline at end of file +} diff --git a/src/app/module/agenda/utils.ts b/src/app/module/agenda/utils.ts index a34b84305..759794564 100644 --- a/src/app/module/agenda/utils.ts +++ b/src/app/module/agenda/utils.ts @@ -1,5 +1,4 @@ import { Injectable } from '@angular/core'; -import { EventsService } from 'src/app/services/events.service'; import { RoleIdService } from 'src/app/services/role-id.service' import { TableSharedCalendar } from './data/data-source/agenda-local-data-source.service'; @Injectable({ @@ -7,24 +6,10 @@ import { TableSharedCalendar } from './data/data-source/agenda-local-data-source }) export class Utils { constructor( - public eventService: EventsService, public RoleIdService: RoleIdService, ) { } - // selectedCalendarUserId(CalendarName, postEvent) { - - // if (this.eventService.calendarNamesType[CalendarName]?.['Oficial'] && postEvent.CalendarName == 'Oficial') { - // return this.eventService.calendarNamesType[CalendarName]['OwnerId'] - - // } else if (this.eventService.calendarNamesType[CalendarName]?.['Pessoal'] && postEvent.CalendarName == 'Pessoal') { - - // return this.eventService.calendarNamesType[CalendarName]['OwnerId'] - - // } else { - // return '11:11' - // } - // } selectedCalendarOwner(roleDescription) { diff --git a/src/app/pages/events/events.page.ts b/src/app/pages/events/events.page.ts index 71e210eee..71f0e17ec 100644 --- a/src/app/pages/events/events.page.ts +++ b/src/app/pages/events/events.page.ts @@ -1,5 +1,4 @@ import { Component, OnInit, EventEmitter, Output } from '@angular/core'; -import { EventsService } from 'src/app/services/events.service'; import { NavigationExtras, Router } from '@angular/router'; import { ActivatedRoute, NavigationEnd } from '@angular/router'; import { ModalController, Platform } from '@ionic/angular'; @@ -84,7 +83,6 @@ export class EventsPage implements OnInit { count$: Observable; constructor( - private eventService: EventsService, private router: Router, public activatedRoute: ActivatedRoute, private processes: ProcessesService, diff --git a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts index 2645e9ad8..a472d2ccd 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts +++ b/src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts @@ -11,7 +11,6 @@ import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.pag import { BackgroundService } from '../../../../services/background.service'; import { ThemeService } from 'src/app/services/theme.service' -import { OfflineManagerService } from 'src/app/services/offline-manager.service'; import { RouteService } from 'src/app/services/route.service'; import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; import { TaskService } from 'src/app/services/task.service'; @@ -59,7 +58,6 @@ export class ApproveEventPage implements OnInit { private RouteService: RouteService, private backgroundservice: BackgroundService, public ThemeService: ThemeService, - private offlineManager: OfflineManagerService, private httpErrorHandle: HttpErrorHandle, public TaskService: TaskService, private attachmentsService: AttachmentsService, @@ -197,7 +195,6 @@ export class ApproveEventPage implements OnInit { } else { console.log('send event to revision error: ', result.error) this.httpErrorHandle.httpStatusHandle(result.error) - this.offlineManager.storeRequestData('event-listRever', body); } diff --git a/src/app/pages/gabinete-digital/event-list/event-list.page.ts b/src/app/pages/gabinete-digital/event-list/event-list.page.ts index ed2b355cd..f591fca1a 100644 --- a/src/app/pages/gabinete-digital/event-list/event-list.page.ts +++ b/src/app/pages/gabinete-digital/event-list/event-list.page.ts @@ -11,7 +11,6 @@ import { BackgroundService } from '../../../services/background.service'; import { SortService } from 'src/app/services/functions/sort.service'; import { ThemeService } from 'src/app/services/theme.service' import { RouteService } from 'src/app/services/route.service'; -import { EventsService } from 'src/app/services/events.service'; import { SessionStore } from 'src/app/store/session.service'; import { environment } from 'src/environments/environment'; import { AgendaDataRepositoryService } from 'src/app/module/agenda/data/repository/agenda-data-repository.service'; @@ -67,7 +66,6 @@ export class EventListPage implements OnInit { private backgroundservice: BackgroundService, public ThemeService: ThemeService, private RouteService: RouteService, - public eventService: EventsService, public TaskService: TaskService, public AgendaDataRepositoryService: AgendaDataRepositoryService, public RoleIdService: RoleIdService, diff --git a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts index 88421e847..f05e1ec82 100644 --- a/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts +++ b/src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts @@ -3,7 +3,6 @@ import { ModalController, NavParams } from '@ionic/angular'; 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 { EventsService } from 'src/app/services/events.service'; import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page'; import { AttachmentsService } from 'src/app/services/attachments.service'; import { SearchPage } from 'src/app/pages/search/search.page'; @@ -128,10 +127,8 @@ export class BookMeetingModalPage implements OnInit { private modalController: ModalController, private navParams: NavParams, private attachmentsService: AttachmentsService, - public calendarService: EventsService, private toastService: ToastService, public ThemeService: ThemeService, - public eventService: EventsService, public RoleIdService: RoleIdService, private httpErroHandle: HttpErrorHandle, public TaskService: TaskService, diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts index 068c25b4e..ebbd7687c 100644 --- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts +++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts @@ -15,7 +15,6 @@ import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe'; import { SessionStore } from 'src/app/store/session.service'; import { NotificationsService } from 'src/app/services/notifications.service' import { environment } from 'src/environments/environment'; -import { EventsService } from 'src/app/services/events.service'; import { TaskService } from 'src/app/services/task.service' @Component({ @@ -104,7 +103,6 @@ export class GabineteDigitalPage implements OnInit { public ThemeService: ThemeService, public p: PermissionService, public NotificationsService: NotificationsService, - public eventService: EventsService, public TaskService: TaskService ) { diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts index 3f7d75df6..7499de140 100644 --- a/src/app/services/auth.service.ts +++ b/src/app/services/auth.service.ts @@ -7,13 +7,7 @@ import { BehaviorSubject, of } from 'rxjs'; import { AlertController, Platform } from '@ionic/angular'; import { SessionStore } from '../store/session.service'; import { AESEncrypt } from '../services/aesencrypt.service'; -// import { RochetChatConnectorService } from 'src/app/services/chat/rochet-chat-connector.service'; import { Router } from '@angular/router'; -// import { NfService } from 'src/app/services/chat/nf.service'; -//import { MessageService } from 'src/app/services/chat/message.service'; -import { ProcessesService } from 'src/app/services/processes.service'; -import { AttachmentsService } from 'src/app/services/attachments.service'; -//import { RoomService } from './chat/room.service'; import { Storage } from '@ionic/storage'; import { InitialsService } from './functions/initials.service'; import { PermissionService } from './permission.service'; @@ -36,15 +30,11 @@ export class AuthService { constructor( private http: HttpClient, - private storageService: StorageService, public alertController: AlertController, private aesencrypt: AESEncrypt, // private RochetChatConnectorService: RochetChatConnectorService, private router: Router, // private NfService: NfService, - private processesService: ProcessesService, - private AttachmentsService: AttachmentsService, - private storage: Storage, private initialsService: InitialsService, public p: PermissionService, // public ChatSystemService: ChatSystemService, diff --git a/src/app/services/events.service.ts b/src/app/services/events.service.ts index e18c9b23f..5f33b8d34 100644 --- a/src/app/services/events.service.ts +++ b/src/app/services/events.service.ts @@ -5,7 +5,6 @@ import { Observable } from 'rxjs'; import { environment } from 'src/environments/environment'; import { AuthService } from '../services/auth.service'; import { ChangeProfileService } from './change-profile.service'; -import { OfflineManagerService } from 'src/app/services/offline-manager.service'; import { SessionStore } from '../store/session.service'; import { calendarInterface } from '../models/user.model'; import { Subscribe } from './subcribe'; @@ -72,8 +71,7 @@ export class EventsService { constructor( private http: HttpClient, public user: AuthService, - private changeProfileService: ChangeProfileService, - private offlinemanager: OfflineManagerService) { + private changeProfileService: ChangeProfileService) { // try { // //this.setHeader() diff --git a/src/app/services/hardware-go-back.service.spec.ts b/src/app/services/hardware-go-back.service.spec.ts deleted file mode 100644 index e4b1f2ea9..000000000 --- a/src/app/services/hardware-go-back.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { HardwareGoBackService } from './hardware-go-back.service'; - -describe('HardwareGoBackService', () => { - let service: HardwareGoBackService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(HardwareGoBackService); - }); - - it('should be created', () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/src/app/services/hardware-go-back.service.ts b/src/app/services/hardware-go-back.service.ts deleted file mode 100644 index a0a533693..000000000 --- a/src/app/services/hardware-go-back.service.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { Injectable } from '@angular/core'; - -@Injectable({ - providedIn: 'root' -}) -export class HardwareGoBackService { - - constructor() { } -} diff --git a/src/app/services/notifications.service.ts b/src/app/services/notifications.service.ts index 46e924748..8c88cd9c8 100644 --- a/src/app/services/notifications.service.ts +++ b/src/app/services/notifications.service.ts @@ -64,7 +64,6 @@ export class NotificationsService { private platform: Platform, private router: Router, private zone: NgZone, - private eventtrigger: EventTrigger, private afMessaging: AngularFireMessaging, public NotificationHolderService: NotificationHolderService) { @@ -244,9 +243,9 @@ export class NotificationsService { console.log(notification) this.storenotification(notification) this.notificationReceived.emit(); - this.eventtrigger.publishSomeData({ - notification: "recive" - }) + // this.eventtrigger.publishSomeData({ + // notification: "recive" + // }) // Handle the received message, e.g., show a notification }); } diff --git a/src/app/services/offline-manager.service.spec.ts b/src/app/services/offline-manager.service.spec.ts deleted file mode 100644 index d6cd18851..000000000 --- a/src/app/services/offline-manager.service.spec.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { TestBed } from '@angular/core/testing'; - -import { OfflineManagerService } from './offline-manager.service'; - -describe('OfflineManagerService', () => { - let service: OfflineManagerService; - - beforeEach(() => { - TestBed.configureTestingModule({}); - service = TestBed.inject(OfflineManagerService); - }); - - it('should be created', () => { - expect(service).toBeTruthy(); - }); -}); diff --git a/src/app/services/offline-manager.service.ts b/src/app/services/offline-manager.service.ts deleted file mode 100644 index fbc31a744..000000000 --- a/src/app/services/offline-manager.service.ts +++ /dev/null @@ -1,43 +0,0 @@ -import { Injectable } from '@angular/core'; -import { Storage } from '@ionic/storage'; -import { Observable, from, of, forkJoin } from 'rxjs'; -import { switchMap, finalize } from 'rxjs/operators'; -import { HttpClient } from '@angular/common/http'; -import { ToastController } from '@ionic/angular'; -import { BackgroundService } from 'src/app/services/background.service'; -import { EventsService } from 'src/app/services/events.service'; - - -@Injectable({ - providedIn: 'root' -}) -export class OfflineManagerService { - /* eventservice: EventsService */ - - - constructor( - private storage: Storage, - /* private backgroundservice: BackgroundService */) { } - - synchnize() { - /* this.backgroundservice.registerBackService('Online', () => { - this.storage.get('eventEdit').then((req) => { - JSON.parse(req).forEach(element => { - this.eventservice.editEvent(element, 2, 3).subscribe((res) => { - this.storage.remove('eventEdit') - - }) - }); - }) - }) */ - } - - storeRequestData(key, data) { - return this.storage.set(key, JSON.stringify(data)); - } - - sendRequestData(key) { - return this.storage.get(key) - } - -} \ No newline at end of file diff --git a/src/app/services/rules/event.service.ts b/src/app/services/rules/event.service.ts index 1e6604a67..6b791f662 100644 --- a/src/app/services/rules/event.service.ts +++ b/src/app/services/rules/event.service.ts @@ -1,6 +1,5 @@ import { Injectable } from '@angular/core'; import { AttachmentsService } from '../attachments.service'; -import { EventsService } from '../events.service'; import { PermissionService } from '../permission.service'; @@ -11,7 +10,6 @@ import { PermissionService } from '../permission.service'; export class EventService { constructor( - private eventService: EventsService, public p: PermissionService, private attachmentsService: AttachmentsService, ) { } diff --git a/src/app/services/task.service.ts b/src/app/services/task.service.ts index 9dd10185d..2b3d90625 100644 --- a/src/app/services/task.service.ts +++ b/src/app/services/task.service.ts @@ -13,7 +13,6 @@ import { ExpedienteTaskPipe } from 'src/app/pipes/expediente-task.pipe'; import { DespachoService } from 'src/app/Rules/despacho.service'; import { CustomTaskPipe } from '../pipes/custom-task.pipe'; import { SessionStore } from 'src/app/store/session.service'; -import { EventsService } from './events.service'; import { customTask } from '../models/dailyworktask.model'; import { Router } from '@angular/router'; import { v4 as uuidv4 } from 'uuid' @@ -65,7 +64,6 @@ export class TaskService { constructor( private processesbackend: ProcessesService, private despachoRule: DespachoService, - public eventService: EventsService, private router: Router, private changeProfileService: ChangeProfileService, public p: PermissionService, diff --git a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts index e33b622dd..af30ad291 100644 --- a/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts +++ b/src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts @@ -8,7 +8,6 @@ import { EventoAprovacaoStore } from 'src/app/store/eventoaprovacao-store.servic import { SortService } from 'src/app/services/functions/sort.service'; import { Storage } from '@ionic/storage'; import { SessionStore } from 'src/app/store/session.service'; -import { EventsService } from 'src/app/services/events.service'; import { environment } from 'src/environments/environment'; import { TaskService } from 'src/app/services/task.service' import { ThemeService } from 'src/app/services/theme.service' @@ -63,7 +62,6 @@ export class EventsToApprovePage implements OnInit { private router: Router, private sortService: SortService, private storage: Storage, - public eventService: EventsService, public TaskService: TaskService, public ThemeService: ThemeService, public AgendaDataRepositoryService: AgendaDataRepositoryService, diff --git a/src/app/shared/gabinete-digital/expedients/expedients.page.ts b/src/app/shared/gabinete-digital/expedients/expedients.page.ts index 819825c23..6dbc3b96c 100644 --- a/src/app/shared/gabinete-digital/expedients/expedients.page.ts +++ b/src/app/shared/gabinete-digital/expedients/expedients.page.ts @@ -5,7 +5,6 @@ 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' import { SortService } from 'src/app/services/functions/sort.service'; -import { Storage } from '@ionic/storage'; import { EventTrigger } from 'src/app/services/eventTrigger.service'; import { TaskService } from 'src/app/services/task.service' diff --git a/src/app/ui/agenda/agenda.page.ts b/src/app/ui/agenda/agenda.page.ts index fa6451458..97c7c011d 100644 --- a/src/app/ui/agenda/agenda.page.ts +++ b/src/app/ui/agenda/agenda.page.ts @@ -1,7 +1,6 @@ import { Component, OnInit, ViewChild, Inject, LOCALE_ID, OnDestroy } from '@angular/core'; import { CalendarComponent } from 'ionic2-calendar'; import { ModalController } from '@ionic/angular'; -import { EventsService } from 'src/app/services/events.service'; import { Event } from '../../models/event.model'; import { Router, NavigationEnd, NavigationExtras } from '@angular/router'; import { momentG } from 'src/plugin/momentG'; @@ -198,7 +197,6 @@ export class AgendaPage implements OnInit { constructor( @Inject(LOCALE_ID) private locale: string, private modalCtrl: ModalController, - public eventService: EventsService, private router: Router, private dateAdapter: DateAdapter, public listBoxService: ListBoxService, diff --git a/src/app/ui/agenda/component/approve-event/approve-event.page.ts b/src/app/ui/agenda/component/approve-event/approve-event.page.ts index 9fa615469..b9c78e0ca 100644 --- a/src/app/ui/agenda/component/approve-event/approve-event.page.ts +++ b/src/app/ui/agenda/component/approve-event/approve-event.page.ts @@ -11,7 +11,6 @@ import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'; import { TaskService } from 'src/app/services/task.service' import { AgendaDataRepositoryService } from 'src/app/module/agenda/data/repository/agenda-data-repository.service'; import { EventToApproveDetails } from 'src/app/models/entiry/agenda/eventToApproveDetails'; -import { EventsService } from 'src/app/services/events.service'; import { isHttpError } from 'src/app/services/http.service'; import { TracingType, XTracerAsync } from 'src/app/services/monitoring/opentelemetry/tracer'; import { PermissionService } from 'src/app/services/permission.service'; @@ -56,7 +55,6 @@ export class ApproveEventPage implements OnInit { private httpErroHandle: HttpErrorHandle, public TaskService: TaskService, private agendaDataRepository: AgendaDataRepositoryService, - public EventsService: EventsService, private httpErrorHandle: HttpErrorHandle, public p: PermissionService, ) { diff --git a/src/app/ui/agenda/component/edit-event-to-approve/edit-event-to-approve.page.ts b/src/app/ui/agenda/component/edit-event-to-approve/edit-event-to-approve.page.ts index d77a76c9a..509bf5487 100644 --- a/src/app/ui/agenda/component/edit-event-to-approve/edit-event-to-approve.page.ts +++ b/src/app/ui/agenda/component/edit-event-to-approve/edit-event-to-approve.page.ts @@ -7,7 +7,6 @@ import { EventPerson } from 'src/app/models/eventperson.model'; import { SearchList } from 'src/app/models/search-document'; import { SearchPage } from 'src/app/pages/search/search.page'; import { AttachmentsService } from 'src/app/services/attachments.service'; -import { EventsService } from 'src/app/services/events.service'; import { ProcessesService } from 'src/app/services/processes.service'; import { ToastService } from 'src/app/services/toast.service'; import { NgxMatDateFormats } from '@angular-material-components/datetime-picker'; @@ -131,7 +130,6 @@ export class EditEventToApprovePage implements OnInit { constructor( private modalController: ModalController, - private eventsService: EventsService, public alertController: AlertController, private attachmentsService: AttachmentsService, private processes: ProcessesService, @@ -194,13 +192,6 @@ export class EditEventToApprovePage implements OnInit { } - // getRecurrenceTypes() { - // this.eventsService.getRecurrenceTypes().subscribe(res => { - - // this.recurringTypes = res; - // }); - // } - calculetedLastOccurrence(type: number) { diff --git a/src/app/ui/agenda/component/event-list/event-list.page.ts b/src/app/ui/agenda/component/event-list/event-list.page.ts index 86ccb44bf..1eb8b09de 100644 --- a/src/app/ui/agenda/component/event-list/event-list.page.ts +++ b/src/app/ui/agenda/component/event-list/event-list.page.ts @@ -6,7 +6,6 @@ import { NavigationEnd, Router } from '@angular/router'; import { LoginUserRespose } from 'src/app/models/user.model'; import { SortService } from 'src/app/services/functions/sort.service'; import { SessionStore } from 'src/app/store/session.service'; -import { EventsService } from 'src/app/services/events.service'; import { EventoAprovacaoStore } from 'src/app/store/eventoaprovacao-store.service'; import { environment } from 'src/environments/environment'; import { AgendaDataRepositoryService } from 'src/app/module/agenda/data/repository/agenda-data-repository.service'; @@ -52,7 +51,6 @@ export class EventListPage implements OnInit { private processes:ProcessesService, private router: Router, private sortService: SortService, - public eventService: EventsService, public AgendaDataRepositoryService: AgendaDataRepositoryService, public RoleIdService: RoleIdService, private toastService: ToastService, diff --git a/src/app/ui/agenda/component/new-event/new-event.page.ts b/src/app/ui/agenda/component/new-event/new-event.page.ts index 570812386..1ccec4dd3 100644 --- a/src/app/ui/agenda/component/new-event/new-event.page.ts +++ b/src/app/ui/agenda/component/new-event/new-event.page.ts @@ -1,7 +1,6 @@ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; import { EventBody } from 'src/app/models/eventbody.model'; import { EventPerson } from 'src/app/models/eventperson.model'; -import { EventsService } from 'src/app/services/events.service'; import { Event } from 'src/app/models/event.model'; import { ModalController } from '@ionic/angular'; import { removeDuplicate } from 'src/plugin/removeDuplicate.js' @@ -142,7 +141,6 @@ export class NewEventPage implements OnInit { hasChangeCalendar = false constructor( private modalController: ModalController, - public eventService: EventsService, private toastService: ToastService, private dateAdapter: DateAdapter, public ThemeService: ThemeService, diff --git a/src/app/ui/agenda/component/view-event/view-event.page.ts b/src/app/ui/agenda/component/view-event/view-event.page.ts index 498fadca7..c278802f4 100644 --- a/src/app/ui/agenda/component/view-event/view-event.page.ts +++ b/src/app/ui/agenda/component/view-event/view-event.page.ts @@ -2,7 +2,6 @@ import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'; import { AlertController, ModalController, PopoverController } from '@ionic/angular'; import { Attachment } from 'src/app/models/attachment.model'; import { EventBody } from 'src/app/models/eventbody.model'; -import { EventsService } from 'src/app/services/events.service'; import { Event } from 'src/app/models/event.model'; import { InAppBrowser } from '@ionic-native/in-app-browser/ngx'; import { ProcessesService } from 'src/app/services/processes.service'; @@ -60,7 +59,6 @@ export class ViewEventPage implements OnInit { daysToEnd = 0 constructor( - public eventsService: EventsService, public alertController: AlertController, private iab: InAppBrowser, private processes: ProcessesService, @@ -269,66 +267,7 @@ export class ViewEventPage implements OnInit { } - // async deleteEvent() { - // if (this.loadedEvent.IsRecurring) { - // const loader = this.toastService.loading() - - // if(this.sesseionStora.user.Profile == 'MDGPR' || this.sesseionStora.user.Profile == 'PR') { - // this.eventsService.deleteEvent(this.loadedEvent.EventId, 0, this.loadedEvent.CalendarName).subscribe(async () => { - // this.httpErrorHandle.httpsSucessMessagge('delete event') - // this.close(); - // },(error)=>{ - // this.httpErrorHandle.httpStatusHandle(error) - // }, - // ()=>{ - // loader.remove(); - // }); - // } else { - - // if(this.CalendarId) { - // this.eventsService.genericDeleteEvent(this.loadedEvent.EventId, 0, this.loadedEvent.CalendarName, this.CalendarId).subscribe(async () => { - // this.httpErrorHandle.httpsSucessMessagge('delete event'); - // this.close(); - // },(error)=>{ - // this.httpErrorHandle.httpStatusHandle(error) - // }, - // ()=>{ - // loader.remove(); - // }); - // } - - // } - - // } else { - - // const loader = this.toastService.loading() - - // if(this.sesseionStora.user.Profile == 'MDGPR' || this.sesseionStora.user.Profile == 'PR') { - // this.eventsService.deleteEvent(this.loadedEvent.EventId, 0, this.loadedEvent.CalendarName).subscribe(async () => { - // this.httpErrorHandle.httpsSucessMessagge('delete event'); - // this.close(); - // },(error)=>{ - // this.httpErrorHandle.httpStatusHandle(error) - // }, - // ()=>{ - // loader.remove(); - // }); - // } else { - // this.eventsService.genericDeleteEvent(this.loadedEvent.EventId, 0, this.loadedEvent.CalendarName, this.CalendarId).subscribe(async () => { - // this.httpErrorHandle.httpsSucessMessagge('delete event'); - // this.close(); - // },(error)=>{ - // this.httpErrorHandle.httpStatusHandle(error) - // }, - // ()=>{ - // loader.remove(); - // }); - // } - - // } - - // } async deleteRecurringEvent() { diff --git a/src/app/ui/agenda/modal/edit-event/edit-event.page.ts b/src/app/ui/agenda/modal/edit-event/edit-event.page.ts index f825ba55c..7160bc290 100644 --- a/src/app/ui/agenda/modal/edit-event/edit-event.page.ts +++ b/src/app/ui/agenda/modal/edit-event/edit-event.page.ts @@ -5,7 +5,6 @@ import { Attachment } from 'src/app/models/attachment.model'; import { EventBody } from 'src/app/models/eventbody.model'; import { EventPerson } from 'src/app/models/eventperson.model'; import { AttachmentsService } from 'src/app/services/attachments.service'; -import { EventsService } from 'src/app/services/events.service'; import { Event } from '../../../../models/event.model'; import { AttendeesPageModal } from '../../../../pages/events/attendees/attendees.page'; import { SearchPage } from '../../../../pages/search/search.page'; @@ -116,7 +115,6 @@ export class EditEventPage implements OnInit { constructor( private modalController: ModalController, private navParams: NavParams, - public eventsService: EventsService, public alertController: AlertController, private attachmentsService: AttachmentsService, public ThemeService: ThemeService, diff --git a/src/app/ui/agenda/modal/new-event/new-event.page.ts b/src/app/ui/agenda/modal/new-event/new-event.page.ts index 5946b53eb..3195d0ae3 100644 --- a/src/app/ui/agenda/modal/new-event/new-event.page.ts +++ b/src/app/ui/agenda/modal/new-event/new-event.page.ts @@ -4,7 +4,6 @@ import { EventBody } from 'src/app/models/eventbody.model'; import { EventPerson } from 'src/app/models/eventperson.model'; import { SearchList } from 'src/app/models/search-document'; import { LoginUserRespose } from 'src/app/models/user.model'; -import { EventsService } from 'src/app/services/events.service'; import { ToastService } from 'src/app/services/toast.service'; import { Event } from '../../../../models/event.model'; import { AttendeesPageModal } from '../../../../pages/events/attendees/attendees.page'; @@ -124,7 +123,6 @@ export class NewEventPage implements OnInit { constructor( private modalController: ModalController, private navParams: NavParams, - public eventService: EventsService, private toastService: ToastService, public ThemeService: ThemeService, private platform: Platform, diff --git a/src/app/ui/agenda/modal/view-event/view-event.page.ts b/src/app/ui/agenda/modal/view-event/view-event.page.ts index 1101171d6..1231df443 100644 --- a/src/app/ui/agenda/modal/view-event/view-event.page.ts +++ b/src/app/ui/agenda/modal/view-event/view-event.page.ts @@ -1,7 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { AlertController, ModalController, PopoverController, Platform } from '@ionic/angular'; import { EventBody } from 'src/app/models/eventbody.model'; -import { EventsService } from 'src/app/services/events.service'; import { Event } from '../../../../models/event.model'; import { EditEventPage } from '../edit-event/edit-event.page'; import { ActivatedRoute } from '@angular/router'; @@ -59,7 +58,6 @@ export class ViewEventPage implements OnInit { constructor( private modalController: ModalController, - public eventsService: EventsService, public alertController: AlertController, public popoverController: PopoverController, private activatedRoute: ActivatedRoute, diff --git a/src/app/ui/chat/component/messages/messages.page.ts b/src/app/ui/chat/component/messages/messages.page.ts index f7aa7418f..d0c04706c 100644 --- a/src/app/ui/chat/component/messages/messages.page.ts +++ b/src/app/ui/chat/component/messages/messages.page.ts @@ -2,7 +2,6 @@ import { AfterViewInit, Component, ElementRef, EventEmitter, HostListener, Input import { AnimationController, GestureController, IonRange, ModalController, PopoverController } from '@ionic/angular'; import { ToastService } from 'src/app/services/toast.service'; import { ContactsPage } from '../contacts/contacts.page'; -import { ChatOptionsFeaturesPage } from 'src/app/modals/chat-options-features/chat-options-features.page'; import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page'; import { ThemeService } from 'src/app/services/theme.service'; import { FileType } from 'src/app/models/fileType'; @@ -35,7 +34,6 @@ import { ChatPopoverPage } from '../../modal/chat-popover/chat-popover.page'; import { LastMessage } from '../../utils/lastMessage'; import { UserTypingLocalRepository } from 'src/app/module/chat/data/repository/typing/user-typing-local-data-source.service'; import { UserTypingRemoteRepositoryService } from 'src/app/module/chat/data/repository/typing/user-typing-live-data-source.service'; -import { MessageLocalDataSourceService } from 'src/app/module/chat/data/repository/message/message-local-data-source.service'; import { RoomType } from "src/app/core/chat/entity/group"; import { Logger } from 'src/app/services/logger/main/service'; import { tap } from 'rxjs/operators'; @@ -44,8 +42,6 @@ import { ViewOncesImagePage, ViewOncesImagePageInput } from '../../modal/view-on import { MemberTable } from 'src/app/infra/database/dexie/instance/chat/schema/members'; import { MessageTable } from 'src/app/infra/database/dexie/instance/chat/schema/message'; import { RoomTable } from 'src/app/infra/database/dexie/instance/chat/schema/room'; -import { TypingTable } from 'src/app/infra/database/dexie/instance/chat/schema/typing'; -import { HttpClient } from '@angular/common/http'; import { RoomViewModel } from '../../store/model/room'; import { MessageViewModal } from '../../store/model/message'; import { XBallon } from '../../utils/messageBallon'; @@ -176,9 +172,7 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy private RoomLocalRepository: RoomLocalRepository, private userTypingLocalRepository: UserTypingLocalRepository, private UserTypingRemoteRepositoryService: UserTypingRemoteRepositoryService, - private messageLocalDataSourceService: MessageLocalDataSourceService, private alertController: AlertController, - private http: HttpClient ) { // update this.checkAudioPermission() @@ -1308,83 +1302,6 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy } - async _openChatOptions() { - const roomId = this.room.$id; - - - const enterAnimation = (baseEl: any) => { - const backdropAnimation = this.animationController.create() - .addElement(baseEl.querySelector('ion-backdrop')!) - .fromTo('opacity', '0.01', 'var(--backdrop-opacity)'); - - const wrapperAnimation = this.animationController.create() - .addElement(baseEl.querySelector('.modal-wrapper')!) - .keyframes([ - { offset: 0, opacity: '1', right: '-100%' }, - { offset: 1, opacity: '1', right: '0px' } - ]); - - return this.animationController.create() - .addElement(baseEl) - .easing('ease-out') - .duration(500) - .addAnimation([backdropAnimation, wrapperAnimation]); - } - - const leaveAnimation = (baseEl: any) => { - return enterAnimation(baseEl).direction('reverse'); - } - - const modal = await this.modalController.create({ - enterAnimation, - leaveAnimation, - component: ChatOptionsFeaturesPage, - cssClass: 'model profile-modal search-submodal', - componentProps: { - roomId: this.room.$id, - members: [], - } - }); - - modal.onDidDismiss().then(async (res) => { - - - - if (res['data'] == 'meeting') { - //this.closeAllDesktopComponents.emit(); - let data = { - roomId: this.room.$id, - members: [] - } - this.openNewEventPage.emit(data); - } - else if (res['data'] == 'take-picture') { - - this.takePictureMobile() - - } - else if (res['data'] == 'add-picture') { - - this.pickPicture() - - } - else if (res['data'] == 'add-document') { - - this.addFile() - - } - else if (res['data'] == 'documentoGestaoDocumental') { - - this.addFileWebtrix() - - this.showLoader = false; - } - - }); - await modal.present(); - - } - async audioPreview(msg) { if (!msg.attachments[0].title_link || msg.attachments[0].title_link === null || msg.attachments[0].title_link === '') { diff --git a/version/git-version.ts b/version/git-version.ts index 9aece8c88..11db41437 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,11 +1,11 @@ export let versionData = { - "shortSHA": "3f41e9e9c", - "SHA": "3f41e9e9c0c6d7d0998da715885c76a2891dbd5f", + "shortSHA": "661b449fb", + "SHA": "661b449fb4818c27a829f1ba91b0d73b2eb1e3b5", "branch": "feature/chat-new-api-peter", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Fri Oct 18 12:12:55 2024 +0100'", - "lastCommitMessage": "remove unnecessary code", - "lastCommitNumber": "6102", - "changeStatus": "On branch feature/chat-new-api-peter\nYour branch is ahead of 'origin/feature/chat-new-api-peter' by 2 commits.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/home/home.page.ts\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.html\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/module/agenda/data/repository/agenda-data-repository.service.ts\n\tmodified: src/app/module/agenda/utils.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html\n\tmodified: src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.page.ts\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedidos.page.ts\n\tmodified: src/app/pages/gabinete-digital/pendentes/pendentes.page.ts\n\tmodified: src/app/pages/publications/new-publication/new-publication.page.ts\n\tmodified: src/app/pages/search/sender/sender.page.ts\n\tdeleted: src/app/services/cache-service.service.ts\n\tdeleted: src/app/services/chunkService.ts\n\tdeleted: src/app/services/contacts.service.spec.ts\n\tdeleted: src/app/services/contacts.service.ts\n\tdeleted: src/app/services/data.service.spec.ts\n\tdeleted: src/app/services/domain/chat/chat-service.service.spec.ts\n\tdeleted: src/app/services/domain/chat/chat-service.service.ts\n\tmodified: src/app/services/events.service.ts\n\tdeleted: src/app/services/fcm.service.spec.ts\n\tdeleted: src/app/services/fcm.service.ts\n\tdeleted: src/app/services/fileExprorer/file-exprorer.service.spec.ts\n\tdeleted: src/app/services/fileExprorer/file-exprorer.service.ts\n\tdeleted: src/app/services/network-connection.service.spec.ts\n\tdeleted: src/app/services/network-connection.service.ts\n\tdeleted: src/app/services/notification-message.service.spec.ts\n\tdeleted: src/app/services/notification-message.service.ts\n\tdeleted: src/app/services/photo.service.spec.ts\n\tdeleted: src/app/services/photo.service.ts\n\tdeleted: src/app/services/socket-connection-mcr.service.spec.ts\n\tdeleted: src/app/services/sqlite.service.spec.ts\n\tdeleted: src/app/services/sqlite.service.ts\n\tdeleted: src/app/services/videoCompression.service.ts\n\tdeleted: src/app/services/videoconvert.service.spec.ts\n\tdeleted: src/app/services/websocket.service.spec.ts\n\tdeleted: src/app/services/websocket.service.ts\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.ts\n\tmodified: src/app/shared/publication/new-publication/new-publication.page.ts\n\tmodified: src/app/shared/publication/upload/upload-streaming.service.ts\n\tdeleted: src/app/store/documentManagement.ts\n\tmodified: src/app/ui/agenda/agenda.page.ts\n\tmodified: src/app/ui/agenda/component/edit-event-to-approve/edit-event-to-approve.page.ts\n\tmodified: src/app/ui/agenda/component/new-event/new-event.page.ts\n\tmodified: src/app/ui/agenda/modal/new-event/new-event.page.ts\n\trenamed: src/app/services/agenda/list-box.service.spec.ts -> src/app/ui/agenda/service/list-box.service.spec.ts\n\trenamed: src/app/services/agenda/list-box.service.ts -> src/app/ui/agenda/service/list-box.service.ts", + "lastCommitTime": "'Fri Oct 18 16:22:45 2024 +0100'", + "lastCommitMessage": "improve setup meeting from task", + "lastCommitNumber": "6103", + "changeStatus": "On branch feature/chat-new-api-peter\nYour branch is ahead of 'origin/feature/chat-new-api-peter' by 3 commits.\n (use \"git push\" to publish your local commits)\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tdeleted: src/app/Rules/aprove-event.service.spec.ts\n\tdeleted: src/app/Rules/aprove-event.service.ts\n\tmodified: src/app/app-routing.module.ts\n\tmodified: src/app/home/home.page.ts\n\tdeleted: src/app/modals/chat-options-features/chat-options-features-routing.module.ts\n\tdeleted: src/app/modals/chat-options-features/chat-options-features.module.ts\n\tdeleted: src/app/modals/chat-options-features/chat-options-features.page.html\n\tdeleted: src/app/modals/chat-options-features/chat-options-features.page.scss\n\tdeleted: src/app/modals/chat-options-features/chat-options-features.page.spec.ts\n\tdeleted: src/app/modals/chat-options-features/chat-options-features.page.ts\n\tmodified: src/app/modals/document-set-up-meeting/document-set-up-meeting.page.ts\n\tmodified: src/app/modals/forward/forward.page.ts\n\tmodified: src/app/module/agenda/utils.ts\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\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.ts\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.ts\n\tmodified: src/app/services/auth.service.ts\n\tmodified: src/app/services/events.service.ts\n\tdeleted: src/app/services/hardware-go-back.service.spec.ts\n\tdeleted: src/app/services/hardware-go-back.service.ts\n\tmodified: src/app/services/notifications.service.ts\n\tdeleted: src/app/services/offline-manager.service.spec.ts\n\tdeleted: src/app/services/offline-manager.service.ts\n\tmodified: src/app/services/rules/event.service.ts\n\tmodified: src/app/services/task.service.ts\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/ui/agenda/agenda.page.ts\n\tmodified: src/app/ui/agenda/component/approve-event/approve-event.page.ts\n\tmodified: src/app/ui/agenda/component/edit-event-to-approve/edit-event-to-approve.page.ts\n\tmodified: src/app/ui/agenda/component/event-list/event-list.page.ts\n\tmodified: src/app/ui/agenda/component/new-event/new-event.page.ts\n\tmodified: src/app/ui/agenda/component/view-event/view-event.page.ts\n\tmodified: src/app/ui/agenda/modal/edit-event/edit-event.page.ts\n\tmodified: src/app/ui/agenda/modal/new-event/new-event.page.ts\n\tmodified: src/app/ui/agenda/modal/view-event/view-event.page.ts\n\tmodified: src/app/ui/chat/component/messages/messages.page.ts\n\tmodified: version/git-version.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file