remove unnecessary code

src/app/app-routing.module.ts

@@ -102,18 +102,6 @@ const routes = [
     path: 'fingerprint',
     loadChildren: () => import('./shared/fingerprint/fingerprint.module').then( m => m.FingerprintPageModule)
   },
-  {
-    path: 'new-event',
-    loadChildren: () => import('./shared/agenda/new-event/new-event.module').then( m => m.NewEventPageModule)
-  },
-  {
-    path: 'event-list',
-    loadChildren: () => import('./shared/agenda/event-list/event-list.module').then( m => m.EventListPageModule)
-  },
-  {
-    path: 'approve-event',
-    loadChildren: () => import('./shared/agenda/approve-event/approve-event.module').then( m => m.ApproveEventPageModule)
-  },
   {
     path: 'bad-request',
     loadChildren: () => import('./shared/popover/bad-request/bad-request.module').then( m => m.BadRequestPageModule)
@@ -126,10 +114,6 @@ const routes = [
     path: 'forward',
     loadChildren: () => import('./modals/forward/forward.module').then( m => m.ForwardPageModule)
   },
-  {
-    path: 'edit-event-to-approve',
-    loadChildren: () => import('./shared/agenda/edit-event-to-approve/edit-event-to-approve.module').then( m => m.EditEventToApprovePageModule)
-  },
   {
     path: 'actions-options',
     loadChildren: () => import('./shared/popover/actions-options/actions-options.module').then( m => m.ActionsOptionsPageModule)

src/app/controller/event.ts

@@ -1,48 +0,0 @@
-
-//import { ChatController } from './chat'
-export class EventController {
-    static create() {
-
-    }
-
-    static edit() {
-
-    }
-
-
-    static async createOrFindGroupFromEvent(name, attendees) {
-        // chatController.
-        // const {data, roomName} = await ChatController.createGroup(name)
-
-        // const roomId = data.rid
-
-        // if (data.error.error == "error-duplicate-channel-name") {
-        //     const getGroupByName = ChatController.ChatSystemService.getGroupByName(roomName)
-        //     if(getGroupByName) {
-        //       return getGroupByName
-        //     }
-        // } else if (roomId) {
-        //     const room = await ChatController.ChatSystemService.waitRoomToCreate(roomId)
-
-        //     const chatUsers: chatUser[] = []
-
-        //     for (let webTRIXUser of attendees ) {
-        //       const username =  webTRIXUser.EmailAddress.split("@")[0];
-        //       const name =  webTRIXUser.Name
-
-        //       const findChatUser = ChatController.ChatSystemService.searchContact(name, username)
-        //       if(findChatUser) {
-        //         chatUsers.push(findChatUser)
-        //       }
-        //     }
-
-        //     for (let chatUser of chatUsers) {
-        //       room.addContacts(chatUser._id)
-        //     }
-
-        //     return room
-        // }
-
-    }
-
-}

src/app/home/home-routing.module.ts

@@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 import { AuthGuard } from '../guards/auth.guard';
 import { InactivityGuard } from '../guards/inactivity.guard';
-import { AgendaPageModule } from '../pages/agenda/agenda.module';
+import { AgendaPageModule } from '../ui/agenda/agenda.module';
 import { EventsPageModule } from '../pages/events/events.module';
 import { GabineteDigitalPageModule } from '../pages/gabinete-digital/gabinete-digital.module';
 import { PublicationsPageModule } from '../pages/publications/publications.module';
@@ -25,7 +25,7 @@ const routes: Routes = [
           },
           {
             path:':eventId/:caller',
-            loadChildren: () => import('../pages/agenda/view-event/view-event.module').then( m => m.ViewEventPageModule),
+            loadChildren: () => import('../ui/agenda/modal/view-event/view-event.module').then( m => m.ViewEventPageModule),
           },
           {
             path:'expediente',
@@ -87,15 +87,15 @@ const routes: Routes = [
           },
           {
             path:':eventId/:caller',
-            loadChildren: () => import('../pages/agenda/view-event/view-event.module').then( m => m.ViewEventPageModule),
+            loadChildren: () => import('../ui/agenda/modal/view-event/view-event.module').then( m => m.ViewEventPageModule),
           },
           {
             path: 'eventId/:caller',
-            loadChildren: () => import('../pages/agenda/view-event/view-event.module').then( m => m.ViewEventPageModule),
+            loadChildren: () => import('../ui/agenda/modal/view-event/view-event.module').then( m => m.ViewEventPageModule),
           },
           {
             path: 'edit-event',
-            loadChildren: () => import('../pages/agenda/edit-event/edit-event.module').then( m => m.EditEventPageModule)
+            loadChildren: () => import('../ui/agenda/modal/edit-event/edit-event.module').then( m => m.EditEventPageModule)
           },
           {
             path: 'emend-message-modal',
@@ -103,7 +103,7 @@ const routes: Routes = [
           },
           {
             path: 'view-event',
-            loadChildren: () => import('../pages/agenda/view-event/view-event.module').then( m => m.ViewEventPageModule)
+            loadChildren: () => import('../ui/agenda/modal/view-event/view-event.module').then( m => m.ViewEventPageModule)
           },
           {
             path:'event-list',

src/app/home/home.module.ts

@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule } from '@angular/forms';
-import { HeaderPageModule } from 'src/app/shared/header/header.module';
+import { HeaderPageModule } from 'src/app/ui/shared/components/header/header.module';
 import { IonicModule } from '@ionic/angular';
 
 import { HomePageRoutingModule } from './home-routing.module';

src/app/modals/chat-options-features/chat-options-features.page.ts

@@ -2,7 +2,7 @@ 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/pages/agenda/new-event/new-event.page';
+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';

src/app/modals/view-event/view-event.page.ts

@@ -11,7 +11,7 @@ import { BackgroundService } from 'src/app/services/background.service';
 import { StorageService } from 'src/app/services/storage.service';
 import { ThemeService } from 'src/app/services/theme.service'
 import { Event } from '../../models/event.model';
-import { EditEventPage } from 'src/app/pages/agenda/edit-event/edit-event.page';
+import { EditEventPage } from 'src/app/ui/agenda/modal/edit-event/edit-event.page';
 import { ExpedientTaskModalPage } from 'src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
 import { RouteService } from 'src/app/services/route.service';
 import { SessionStore } from 'src/app/store/session.service';

src/app/pages/agenda/agenda-routing.module.ts

@@ -1,42 +0,0 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
-
-import { AgendaPage } from './agenda.page';
-
-const routes: Routes = [
-  {
-    path: '',
-    component: AgendaPage
-  },
-  {
-    path: 'approve-event-modal',
-    loadChildren: () => import('../gabinete-digital/event-list/approve-event-modal/approve-event-modal.module').then( m => m.ApproveEventModalPageModule)
-  },
-  {
-    path: 'event-actions-popover',
-    loadChildren: () => import('./event-actions-popover/event-actions-popover.module').then( m => m.EventActionsPopoverPageModule)
-  },
-  {
-    path: 'emend-message-modal',
-    loadChildren: () => import('./emend-message-modal/emend-message-modal.module').then( m => m.EmendMessageModalPageModule)
-  },
-  {
-    path: 'new-event',
-    loadChildren: () => import('./new-event/new-event.module').then( m => m.NewEventPageModule)
-  },
-  {
-    path: 'edit-event',
-    loadChildren: () => import('./edit-event/edit-event.module').then( m => m.EditEventPageModule)
-  },
-  {
-    path: 'view-event',
-    loadChildren: () => import('./view-event/view-event.module').then( m => m.ViewEventPageModule)
-  },
-
-];
-
-@NgModule({
-  imports: [RouterModule.forChild(routes)],
-  exports: [RouterModule],
-})
-export class AgendaPageRoutingModule {}

src/app/pages/events/attendees/attendees.page.ts

@@ -1,7 +1,6 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { EventPerson } from 'src/app/models/eventperson.model';
 import { ModalController, NavParams } from '@ionic/angular';
-import { ContactsService } from 'src/app/services/contacts.service';
 import { ThemeService } from 'src/app/services/theme.service'
 import { LoginUserRespose } from 'src/app/models/user.model';
 import { SessionStore } from 'src/app/store/session.service';

src/app/pages/gabinete-digital/diplomas/diplomas.module.ts

@@ -8,7 +8,7 @@ import { DiplomasPageRoutingModule } from './diplomas-routing.module';
 
 import { DiplomasPage } from './diplomas.page';
 
-import { HeaderPageModule } from 'src/app/shared/header/header.module';
+import { HeaderPageModule } from 'src/app/ui/shared/components/header/header.module';
 import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.module';
 import { MatInputModule } from '@angular/material/input';
 import { MatNativeDateModule } from '@angular/material/core';

src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts

@@ -6,8 +6,8 @@ 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 { EditEventToApproveComponent } from 'src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page';
-import { EmendMessageModalPage } from '../../../agenda/emend-message-modal/emend-message-modal.page';
-import { EventActionsPopoverPage } from '../../../agenda/event-actions-popover/event-actions-popover.page';
+import { EventActionsPopoverPage } from 'src/app/ui/agenda/modal/event-actions-popover/event-actions-popover.page';
+import { EmendMessageModalPage } from 'src/app/ui/agenda/modal/emend-message-modal/emend-message-modal.page';
 import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
 import { ToastService } from 'src/app/services/toast.service';
 import { ThemeService } from 'src/app/services/theme.service'

src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts

@@ -3,8 +3,8 @@ import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
 import { MenuController, ModalController, PopoverController } from '@ionic/angular';
 import { Event } from 'src/app/models/event.model';
 import { ProcessesService } from 'src/app/services/processes.service';
-import { EmendMessageModalPage } from 'src/app/pages/agenda/emend-message-modal/emend-message-modal.page';
-import { EventActionsPopoverPage } from 'src/app/pages/agenda/event-actions-popover/event-actions-popover.page';
+import { EventActionsPopoverPage } from 'src/app/ui/agenda/modal/event-actions-popover/event-actions-popover.page';
+import { EmendMessageModalPage } from 'src/app/ui/agenda/modal/emend-message-modal/emend-message-modal.page';
 import { EditEventToApproveComponent } from 'src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page';
 import { ToastService } from 'src/app/services/toast.service';
 import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';

src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts

@@ -6,7 +6,7 @@ import { Event } from '../../../../models/event.model';
 import { ModalController, PopoverController } from '@ionic/angular';
 import { ExpedientTaskModalPage } from '../expedient-task-modal/expedient-task-modal.page';
 import { BookMeetingModalPage } from '../book-meeting-modal/book-meeting-modal.page';
-import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
+import { ViewEventPage } from 'src/app/ui/agenda/modal/view-event/view-event.page';
 import { momentG } from 'src/plugin/momentG'
 import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page';
 import { ToastService } from 'src/app/services/toast.service';

src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts

@@ -3,7 +3,7 @@ import { ProcessesService } from 'src/app/services/processes.service';
 import { ActivatedRoute } from '@angular/router';
 import { Event } from '../../../../models/event.model';
 import { MenuController, ModalController, PopoverController } from '@ionic/angular';
-import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
+import { ViewEventPage } from 'src/app/ui/agenda/modal/view-event/view-event.page';
 import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page';
 import { ExpedientTaskModalPage } from '../../expediente/expedient-task-modal/expedient-task-modal.page';
 import { BookMeetingModalPage } from '../../expediente/book-meeting-modal/book-meeting-modal.page';

src/app/pages/search/search.page.ts

@@ -5,7 +5,7 @@ import { formatDate } from '@angular/common';
 import { SenderPage } from 'src/app/pages/search/sender/sender.page';
 import { OrganicEntityPage } from 'src/app/pages/search/organic-entity/organic-entity.page';
 import WordCloud from 'src/plugin/wordcloud2.js';
-import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
+import { ViewEventPage } from 'src/app/ui/agenda/modal/view-event/view-event.page';
 import { PublicationDetailPage } from '../publications/view-publications/publication-detail/publication-detail.page';
 import { DocumentDetailPage } from 'src/app/modals/document-detail/document-detail.page';
 import { SearchCategory, SearchList } from 'src/app/models/search-document';

src/app/ui/agenda/agenda-routing.module.ts

@@ -0,0 +1,58 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+
+import { AgendaPage } from './agenda.page';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: AgendaPage
+  },
+  {
+    path: 'approve-event-modal',
+    loadChildren: () => import('../../pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.module').then( m => m.ApproveEventModalPageModule)
+  },
+  {
+    path: 'event-actions-popover',
+    loadChildren: () => import('./modal/event-actions-popover/event-actions-popover.module').then( m => m.EventActionsPopoverPageModule)
+  },
+  {
+    path: 'emend-message-modal',
+    loadChildren: () => import('./modal/emend-message-modal/emend-message-modal.module').then( m => m.EmendMessageModalPageModule)
+  },
+  {
+    path: 'new-event',
+    loadChildren: () => import('./modal/new-event/new-event.module').then( m => m.NewEventPageModule)
+  },
+  {
+    path: 'edit-event',
+    loadChildren: () => import('./modal/edit-event/edit-event.module').then( m => m.EditEventPageModule)
+  },
+  {
+    path: 'view-event',
+    loadChildren: () => import('./modal/view-event/view-event.module').then( m => m.ViewEventPageModule)
+  },
+  {
+    path: 'new-event',
+    loadChildren: () => import('./component/new-event/new-event.module').then( m => m.NewEventPageModule)
+  },
+  {
+    path: 'event-list',
+    loadChildren: () => import('./component/event-list/event-list.module').then( m => m.EventListPageModule)
+  },
+  {
+    path: 'approve-event',
+    loadChildren: () => import('./component/approve-event/approve-event.module').then( m => m.ApproveEventPageModule)
+  },
+  {
+    path: 'edit-event-to-approve',
+    loadChildren: () => import('./component/edit-event-to-approve/edit-event-to-approve.module').then( m => m.EditEventToApprovePageModule)
+  },
+
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class AgendaPageRoutingModule {}

src/app/ui/agenda/agenda.module.ts

@@ -18,15 +18,15 @@ import { CalendarModule, DateAdapter } from 'angular-calendar';
 import { adapterFactory } from 'angular-calendar/date-adapters/date-fns';
 
 import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module';
-import { ViewEventPageModule } from 'src/app/shared/agenda/view-event/view-event.module';
-import { ApproveEventPageModule } from 'src/app/shared/agenda/approve-event/approve-event.module';
-import { NewEventPageModule } from 'src/app/shared/agenda/new-event/new-event.module';
+import { ViewEventPageModule } from 'src/app/ui/agenda/component/view-event/view-event.module';
+import { ApproveEventPageModule } from 'src/app/ui/agenda/component/approve-event/approve-event.module';
+import { NewEventPageModule } from 'src/app/ui/agenda/component/new-event/new-event.module';
 
 
 import { EventsToApprovePageModule } from 'src/app/shared/gabinete-digital/events-to-approve/events-to-approve.module';
-import { EventListPageModule } from 'src/app/shared/agenda/event-list/event-list.module';
-import { EditEventPageModule } from 'src/app/shared/agenda/edit-event/edit-event.module';
-import { EditEventToApprovePageModule } from 'src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.module';
+import { EventListPageModule } from 'src/app/ui/agenda/component/event-list/event-list.module';
+import { EditEventPageModule } from 'src/app/ui/agenda/component/edit-event/edit-event.module';
+import { EditEventToApprovePageModule } from 'src/app/ui/agenda/component/edit-event-to-approve/edit-event-to-approve.module';
 
 import { MatDatepickerModule } from '@angular/material/datepicker';
 import { MatInputModule } from '@angular/material/input';

src/app/ui/agenda/agenda.page.ts

@@ -18,7 +18,7 @@ import {
   DAYS_OF_WEEK,
 } from 'angular-calendar';
 import { CustomDateFormatter } from './custom-date-formatter.provider';
-import { NewEventPage } from './new-event/new-event.page';
+import { NewEventPage } from './modal/new-event/new-event.page';
 import { LoginUserRespose } from 'src/app/models/user.model';
 import { DateAdapter } from '@angular/material/core';
 import { eventSource } from 'src/app/models/agenda/eventSource';

src/app/ui/agenda/component/approve-event/approve-event.page.ts

@@ -4,8 +4,6 @@ import { ModalController, PopoverController } from '@ionic/angular';
 import { Event } from 'src/app/models/event.model';
 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';
-import { EventActionsPopoverPage } from 'src/app/pages/agenda/event-actions-popover/event-actions-popover.page';
 import { ToastService } from 'src/app/services/toast.service';
 import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
 import { ThemeService } from 'src/app/services/theme.service';
@@ -17,6 +15,8 @@ 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';
+import { EventActionsPopoverPage } from 'src/app/ui/agenda/modal/event-actions-popover/event-actions-popover.page';
+import { EmendMessageModalPage } from 'src/app/ui/agenda/modal/emend-message-modal/emend-message-modal.page';
 
 @Component({
   selector: 'app-approve-event',

src/app/ui/agenda/component/edit-event/edit-event.page.ts

@@ -2,7 +2,6 @@ import { Component, OnInit, Input, Output, EventEmitter, ViewChild } from '@angu
 import { ModalController } from '@ionic/angular';
 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 { AlertController } from '@ionic/angular';
 import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
@@ -12,7 +11,6 @@ import { ParticipantsPipe } from 'src/app/pipes/participants.pipe';
 import { ThemeService } from 'src/app/services/theme.service'
 import { SessionStore } from 'src/app/store/session.service';
 import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
-import { ContactsService } from 'src/app/services/contacts.service'
 import { AgendaDataRepositoryService } from 'src/app/module/agenda/data/repository/agenda-data-repository.service';
 import { SearchList_v2 } from 'src/app/models/search-document';
 import { Utils } from 'src/app/module/agenda/utils';
@@ -109,11 +107,9 @@ export class EditEventPage implements OnInit {
 
   constructor(
     private modalController: ModalController,
-    private eventsService: EventsService,
     public alertController: AlertController,
     public ThemeService: ThemeService,
     private httpErrorHandle: HttpErrorHandle,
-    private contactsService: ContactsService,
     private agendaDataRepository: AgendaDataRepositoryService,
     private utils: Utils,
     public RoleIdService: RoleIdService,
@@ -162,20 +158,6 @@ export class EditEventPage implements OnInit {
         }
       }
 
-
-
-      for (const index in this._postEvent.Attendees) {
-        const user = this._postEvent.Attendees[index]
-
-        const userData = this.contactsService.constacts.find(e => user.EmailAddress == e.EmailAddress)
-        if (userData) {
-          this._postEvent.Attendees[index].UserType = userData.UserType
-        } else {
-          console.log('user not set')
-        }
-
-      }
-
       if (this._postEvent.Attendees != null) {
         const result = this.participantsPipe.transform(this._postEvent.Attendees)
         this.taskParticipants = result.taskParticipants

src/app/ui/agenda/component/view-event/view-event.page.ts

@@ -16,7 +16,6 @@ import { ThemeService } from 'src/app/services/theme.service';
 import { SessionStore } from 'src/app/store/session.service';
 import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'
 import { NavigationExtras, Router } from '@angular/router';
-import { EventController } from 'src/app/controller/event'
 import { DateService } from 'src/app/services/date.service';
 import { AgendaDataRepositoryService } from 'src/app/module/agenda/data/repository/agenda-data-repository.service';
 import { SearchList_v2 } from 'src/app/models/search-document';
@@ -137,15 +136,6 @@ export class ViewEventPage implements OnInit {
   }
 
 
-  // async openNewGroupPage() {
-  //   let roomName = this.loadedEvent.Subject
-  //   let attendees = this.loadedEvent.Attendees
-
-  //   const room = await EventController.createOrFindGroupFromEvent(roomName, attendees)
-
-  //   let navigationExtras: NavigationExtras = { queryParams: { "roomId": room.id } };
-  //   this.router.navigate(['/home/chat'], navigationExtras);
-  // }
 
   close() {
 

src/app/ui/agenda/modal/edit-event/edit-event.page.ts

@@ -6,16 +6,15 @@ 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 '../../events/attendees/attendees.page';
-import { SearchPage } from '../../search/search.page';
+import { Event } from '../../../../models/event.model';
+import { AttendeesPageModal } from '../../../../pages/events/attendees/attendees.page';
+import { SearchPage } from '../../../../pages/search/search.page';
 import { ThemeService } from 'src/app/services/theme.service';
 import { NgxMatDateFormats } from '@angular-material-components/datetime-picker';
 import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker';
 import { SessionStore } from 'src/app/store/session.service';
 import { HttpErrorHandle } from 'src/app/services/http-error-handle.service'
 import { environment } from 'src/environments/environment';
-import { ContactsService } from 'src/app/services/contacts.service';
 import { AgendaDataRepositoryService } from 'src/app/module/agenda/data/repository/agenda-data-repository.service';
 import { TableSharedCalendar } from 'src/app/module/agenda/data/data-source/agenda-local-data-source.service';
 import { Observable } from 'rxjs';
@@ -122,7 +121,6 @@ export class EditEventPage implements OnInit {
     private attachmentsService: AttachmentsService,
     public ThemeService: ThemeService,
     private httpErrorHandle: HttpErrorHandle,
-    private contactsService: ContactsService,
     private agendaDataRepository: AgendaDataRepositoryService,
     private utils: Utils,
     public RoleIdService: RoleIdService,
@@ -143,21 +141,6 @@ export class EditEventPage implements OnInit {
     this.validationEditAllEvent()
 
 
-
-    for (const index in this.postEvent.Attendees) {
-      const user = this.postEvent.Attendees[index]
-
-      const userData = this.contactsService.constacts.find(e => user.EmailAddress == e.EmailAddress)
-      if (userData) {
-        this.postEvent.Attendees[index].UserType = userData.UserType
-      }
-
-      console.log('jhv', this.postEvent.Category)
-
-    }
-
-
-
     if (this.postEvent) {
       if (this.postEvent.Body) {
         if (typeof (this.postEvent?.Body?.Text) == 'string') {

src/app/ui/agenda/modal/new-event/new-event.page.ts

@@ -6,9 +6,9 @@ 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 '../../events/attendees/attendees.page';
-import { SearchPage } from '../../search/search.page';
+import { Event } from '../../../../models/event.model';
+import { AttendeesPageModal } from '../../../../pages/events/attendees/attendees.page';
+import { SearchPage } from '../../../../pages/search/search.page';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { ThemeService } from 'src/app/services/theme.service';
 import { NgxMatDateFormats } from '@angular-material-components/datetime-picker';

src/app/ui/agenda/modal/view-event/view-event.page.ts

@@ -2,14 +2,14 @@ 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 { Event } from '../../../../models/event.model';
 import { EditEventPage } from '../edit-event/edit-event.page';
 import { ActivatedRoute } from '@angular/router';
 import { ToastService } from 'src/app/services/toast.service';
 import { EliminateEventPage } from 'src/app/modals/eliminate-event/eliminate-event.page';
 import { ExpedientTaskModalPageNavParamsTask } from 'src/app/models/ExpedientTaskModalPage';
 import { DocumentSetUpMeetingPage } from 'src/app/modals/document-set-up-meeting/document-set-up-meeting.page';
-import { ExpedientTaskModalPage } from '../../gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
+import { ExpedientTaskModalPage } from '../../../../pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page';
 import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
 import { ThemeService } from 'src/app/services/theme.service'
 import { RouteService } from 'src/app/services/route.service';

src/app/ui/chat/chat.module.ts

@@ -9,7 +9,7 @@ import { ChatPageRoutingModule } from './chat-routing.module';
 import { ChatPage } from './chat.page';
 import { RouterModule } from '@angular/router';
 import { PipesModule } from 'src/app/pipes/pipes.module';
-import { NewEventPageModule } from 'src/app/shared/agenda/new-event/new-event.module';
+import { NewEventPageModule } from 'src/app/ui/agenda/component/new-event/new-event.module';
 import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module';
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
 import { ImageCropperModule } from 'ngx-image-cropper';

src/app/ui/chat/modal/chat-options-popover/chat-options-popover.page.ts

@@ -2,7 +2,7 @@ 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/pages/agenda/new-event/new-event.page';
+import { NewEventPage } from 'src/app/ui/agenda/modal/new-event/new-event.page';
 import { SearchPage } from 'src/app/pages/search/search.page';
 import { environment } from 'src/environments/environment';
 import { ThemeService } from 'src/app/services/theme.service'