From 3f41e9e9c0c6d7d0998da715885c76a2891dbd5f Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 18 Oct 2024 12:12:55 +0100 Subject: [PATCH] remove unnecessary code --- src/app/app-routing.module.ts | 16 ----- src/app/controller/event.ts | 48 --------------- src/app/home/home-routing.module.ts | 12 ++-- src/app/home/home.module.ts | 2 +- .../chat-options-features.page.ts | 2 +- src/app/modals/view-event/view-event.page.ts | 2 +- src/app/pages/agenda/agenda-routing.module.ts | 42 -------------- .../pages/events/attendees/attendees.page.ts | 1 - .../diplomas/diplomas.module.ts | 2 +- .../approve-event-modal.page.ts | 4 +- .../approve-event/approve-event.page.ts | 4 +- .../expediente-detail.page.ts | 2 +- .../expediente-pr/expediente-pr.page.ts | 2 +- src/app/pages/search/search.page.ts | 2 +- src/app/ui/agenda/agenda-routing.module.ts | 58 +++++++++++++++++++ src/app/{pages => ui}/agenda/agenda.module.ts | 12 ++-- src/app/{pages => ui}/agenda/agenda.page.html | 0 src/app/{pages => ui}/agenda/agenda.page.scss | 0 .../{pages => ui}/agenda/agenda.page.spec.ts | 0 src/app/{pages => ui}/agenda/agenda.page.ts | 2 +- .../approve-event-routing.module.ts | 0 .../approve-event/approve-event.module.ts | 0 .../approve-event/approve-event.page.html | 0 .../approve-event/approve-event.page.scss | 0 .../approve-event/approve-event.page.spec.ts | 0 .../approve-event/approve-event.page.ts | 4 +- .../edit-event-to-approve-routing.module.ts | 0 .../edit-event-to-approve.module.ts | 0 .../edit-event-to-approve.page.html | 0 .../edit-event-to-approve.page.scss | 0 .../edit-event-to-approve.page.spec.ts | 0 .../edit-event-to-approve.page.ts | 0 .../edit-event/edit-event-routing.module.ts | 0 .../edit-event/edit-event.module.ts | 0 .../edit-event/edit-event.page.html | 0 .../edit-event/edit-event.page.scss | 0 .../edit-event/edit-event.page.spec.ts | 0 .../component}/edit-event/edit-event.page.ts | 18 ------ .../event-list/event-list-routing.module.ts | 0 .../event-list/event-list.module.ts | 0 .../event-list/event-list.page.html | 0 .../event-list/event-list.page.scss | 0 .../event-list/event-list.page.spec.ts | 0 .../component}/event-list/event-list.page.ts | 0 .../new-event/new-event-routing.module.ts | 0 .../component}/new-event/new-event.module.ts | 0 .../component}/new-event/new-event.page.html | 0 .../component}/new-event/new-event.page.scss | 0 .../new-event/new-event.page.spec.ts | 0 .../component}/new-event/new-event.page.ts | 0 .../view-event/view-event-routing.module.ts | 0 .../view-event/view-event.module.ts | 0 .../view-event/view-event.page.html | 0 .../view-event/view-event.page.scss | 0 .../view-event/view-event.page.spec.ts | 0 .../component}/view-event/view-event.page.ts | 10 ---- .../agenda/custom-date-formatter.provider.ts | 0 .../edit-event/edit-event-routing.module.ts | 0 .../modal}/edit-event/edit-event.module.ts | 0 .../modal}/edit-event/edit-event.page.html | 0 .../modal}/edit-event/edit-event.page.scss | 0 .../modal}/edit-event/edit-event.page.spec.ts | 0 .../modal}/edit-event/edit-event.page.ts | 23 +------- .../emend-message-modal-routing.module.ts | 0 .../emend-message-modal.module.ts | 0 .../emend-message-modal.page.html | 0 .../emend-message-modal.page.scss | 0 .../emend-message-modal.page.spec.ts | 0 .../emend-message-modal.page.ts | 0 .../event-actions-popover-routing.module.ts | 0 .../event-actions-popover.module.ts | 0 .../event-actions-popover.page.html | 0 .../event-actions-popover.page.scss | 0 .../event-actions-popover.page.spec.ts | 0 .../event-actions-popover.page.ts | 0 .../new-event/new-event-routing.module.ts | 0 .../modal}/new-event/new-event.module.ts | 0 .../modal}/new-event/new-event.page.html | 0 .../modal}/new-event/new-event.page.scss | 0 .../modal}/new-event/new-event.page.spec.ts | 0 .../agenda/modal}/new-event/new-event.page.ts | 6 +- .../view-event/view-event-routing.module.ts | 0 .../modal}/view-event/view-event.module.ts | 0 .../modal}/view-event/view-event.page.html | 0 .../modal}/view-event/view-event.page.scss | 0 .../modal}/view-event/view-event.page.spec.ts | 0 .../modal}/view-event/view-event.page.ts | 4 +- src/app/ui/chat/chat.module.ts | 2 +- .../chat-options-popover.page.ts | 2 +- .../header-pr/header-pr-routing.module.ts | 0 .../components}/header-pr/header-pr.module.ts | 0 .../components}/header-pr/header-pr.page.html | 0 .../components}/header-pr/header-pr.page.scss | 0 .../header-pr/header-pr.page.spec.ts | 0 .../components}/header-pr/header-pr.page.ts | 0 .../header/header-routing.module.ts | 0 .../components}/header/header.module.ts | 0 .../components}/header/header.page.html | 0 .../components}/header/header.page.scss | 0 .../components}/header/header.page.spec.ts | 0 .../shared/components}/header/header.page.ts | 4 +- version/git-version.ts | 12 ++-- 102 files changed, 102 insertions(+), 196 deletions(-) delete mode 100644 src/app/controller/event.ts delete mode 100644 src/app/pages/agenda/agenda-routing.module.ts create mode 100644 src/app/ui/agenda/agenda-routing.module.ts rename src/app/{pages => ui}/agenda/agenda.module.ts (79%) rename src/app/{pages => ui}/agenda/agenda.page.html (100%) rename src/app/{pages => ui}/agenda/agenda.page.scss (100%) rename src/app/{pages => ui}/agenda/agenda.page.spec.ts (100%) rename src/app/{pages => ui}/agenda/agenda.page.ts (99%) rename src/app/{shared/agenda => ui/agenda/component}/approve-event/approve-event-routing.module.ts (100%) rename src/app/{shared/agenda => ui/agenda/component}/approve-event/approve-event.module.ts (100%) rename src/app/{shared/agenda => ui/agenda/component}/approve-event/approve-event.page.html (100%) rename src/app/{shared/agenda => ui/agenda/component}/approve-event/approve-event.page.scss (100%) rename src/app/{shared/agenda => ui/agenda/component}/approve-event/approve-event.page.spec.ts (100%) rename src/app/{shared/agenda => ui/agenda/component}/approve-event/approve-event.page.ts (97%) rename src/app/{shared/agenda => ui/agenda/component}/edit-event-to-approve/edit-event-to-approve-routing.module.ts (100%) rename src/app/{shared/agenda => ui/agenda/component}/edit-event-to-approve/edit-event-to-approve.module.ts (100%) rename src/app/{shared/agenda => ui/agenda/component}/edit-event-to-approve/edit-event-to-approve.page.html (100%) rename src/app/{shared/agenda => ui/agenda/component}/edit-event-to-approve/edit-event-to-approve.page.scss (100%) rename src/app/{shared/agenda => ui/agenda/component}/edit-event-to-approve/edit-event-to-approve.page.spec.ts (100%) rename src/app/{shared/agenda => ui/agenda/component}/edit-event-to-approve/edit-event-to-approve.page.ts (100%) rename src/app/{pages/agenda => ui/agenda/component}/edit-event/edit-event-routing.module.ts (100%) rename src/app/{shared/agenda => ui/agenda/component}/edit-event/edit-event.module.ts (100%) rename src/app/{shared/agenda => ui/agenda/component}/edit-event/edit-event.page.html (100%) rename src/app/{shared/agenda => ui/agenda/component}/edit-event/edit-event.page.scss (100%) rename src/app/{shared/agenda => ui/agenda/component}/edit-event/edit-event.page.spec.ts (100%) rename src/app/{shared/agenda => ui/agenda/component}/edit-event/edit-event.page.ts (97%) rename src/app/{shared/agenda => ui/agenda/component}/event-list/event-list-routing.module.ts (100%) rename src/app/{shared/agenda => ui/agenda/component}/event-list/event-list.module.ts (100%) rename src/app/{shared/agenda => ui/agenda/component}/event-list/event-list.page.html (100%) rename src/app/{shared/agenda => ui/agenda/component}/event-list/event-list.page.scss (100%) rename src/app/{shared/agenda => ui/agenda/component}/event-list/event-list.page.spec.ts (100%) rename src/app/{shared/agenda => ui/agenda/component}/event-list/event-list.page.ts (100%) rename src/app/{pages/agenda => ui/agenda/component}/new-event/new-event-routing.module.ts (100%) rename src/app/{shared/agenda => ui/agenda/component}/new-event/new-event.module.ts (100%) rename src/app/{shared/agenda => ui/agenda/component}/new-event/new-event.page.html (100%) rename src/app/{shared/agenda => ui/agenda/component}/new-event/new-event.page.scss (100%) rename src/app/{shared/agenda => ui/agenda/component}/new-event/new-event.page.spec.ts (100%) rename src/app/{shared/agenda => ui/agenda/component}/new-event/new-event.page.ts (100%) rename src/app/{pages/agenda => ui/agenda/component}/view-event/view-event-routing.module.ts (100%) rename src/app/{shared/agenda => ui/agenda/component}/view-event/view-event.module.ts (100%) rename src/app/{shared/agenda => ui/agenda/component}/view-event/view-event.page.html (100%) rename src/app/{shared/agenda => ui/agenda/component}/view-event/view-event.page.scss (100%) rename src/app/{pages/agenda => ui/agenda/component}/view-event/view-event.page.spec.ts (100%) rename src/app/{shared/agenda => ui/agenda/component}/view-event/view-event.page.ts (96%) rename src/app/{pages => ui}/agenda/custom-date-formatter.provider.ts (100%) rename src/app/{shared/agenda => ui/agenda/modal}/edit-event/edit-event-routing.module.ts (100%) rename src/app/{pages/agenda => ui/agenda/modal}/edit-event/edit-event.module.ts (100%) rename src/app/{pages/agenda => ui/agenda/modal}/edit-event/edit-event.page.html (100%) rename src/app/{pages/agenda => ui/agenda/modal}/edit-event/edit-event.page.scss (100%) rename src/app/{pages/agenda => ui/agenda/modal}/edit-event/edit-event.page.spec.ts (100%) rename src/app/{pages/agenda => ui/agenda/modal}/edit-event/edit-event.page.ts (96%) rename src/app/{pages/agenda => ui/agenda/modal}/emend-message-modal/emend-message-modal-routing.module.ts (100%) rename src/app/{pages/agenda => ui/agenda/modal}/emend-message-modal/emend-message-modal.module.ts (100%) rename src/app/{pages/agenda => ui/agenda/modal}/emend-message-modal/emend-message-modal.page.html (100%) rename src/app/{pages/agenda => ui/agenda/modal}/emend-message-modal/emend-message-modal.page.scss (100%) rename src/app/{pages/agenda => ui/agenda/modal}/emend-message-modal/emend-message-modal.page.spec.ts (100%) rename src/app/{pages/agenda => ui/agenda/modal}/emend-message-modal/emend-message-modal.page.ts (100%) rename src/app/{pages/agenda => ui/agenda/modal}/event-actions-popover/event-actions-popover-routing.module.ts (100%) rename src/app/{pages/agenda => ui/agenda/modal}/event-actions-popover/event-actions-popover.module.ts (100%) rename src/app/{pages/agenda => ui/agenda/modal}/event-actions-popover/event-actions-popover.page.html (100%) rename src/app/{pages/agenda => ui/agenda/modal}/event-actions-popover/event-actions-popover.page.scss (100%) rename src/app/{pages/agenda => ui/agenda/modal}/event-actions-popover/event-actions-popover.page.spec.ts (100%) rename src/app/{pages/agenda => ui/agenda/modal}/event-actions-popover/event-actions-popover.page.ts (100%) rename src/app/{shared/agenda => ui/agenda/modal}/new-event/new-event-routing.module.ts (100%) rename src/app/{pages/agenda => ui/agenda/modal}/new-event/new-event.module.ts (100%) rename src/app/{pages/agenda => ui/agenda/modal}/new-event/new-event.page.html (100%) rename src/app/{pages/agenda => ui/agenda/modal}/new-event/new-event.page.scss (100%) rename src/app/{pages/agenda => ui/agenda/modal}/new-event/new-event.page.spec.ts (100%) rename src/app/{pages/agenda => ui/agenda/modal}/new-event/new-event.page.ts (98%) rename src/app/{shared/agenda => ui/agenda/modal}/view-event/view-event-routing.module.ts (100%) rename src/app/{pages/agenda => ui/agenda/modal}/view-event/view-event.module.ts (100%) rename src/app/{pages/agenda => ui/agenda/modal}/view-event/view-event.page.html (100%) rename src/app/{pages/agenda => ui/agenda/modal}/view-event/view-event.page.scss (100%) rename src/app/{shared/agenda => ui/agenda/modal}/view-event/view-event.page.spec.ts (100%) rename src/app/{pages/agenda => ui/agenda/modal}/view-event/view-event.page.ts (98%) rename src/app/{shared => ui/shared/components}/header-pr/header-pr-routing.module.ts (100%) rename src/app/{shared => ui/shared/components}/header-pr/header-pr.module.ts (100%) rename src/app/{shared => ui/shared/components}/header-pr/header-pr.page.html (100%) rename src/app/{shared => ui/shared/components}/header-pr/header-pr.page.scss (100%) rename src/app/{shared => ui/shared/components}/header-pr/header-pr.page.spec.ts (100%) rename src/app/{shared => ui/shared/components}/header-pr/header-pr.page.ts (100%) rename src/app/{shared => ui/shared/components}/header/header-routing.module.ts (100%) rename src/app/{shared => ui/shared/components}/header/header.module.ts (100%) rename src/app/{shared => ui/shared/components}/header/header.page.html (100%) rename src/app/{shared => ui/shared/components}/header/header.page.scss (100%) rename src/app/{shared => ui/shared/components}/header/header.page.spec.ts (100%) rename src/app/{shared => ui/shared/components}/header/header.page.ts (98%) diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index aea2886e3..37d7c5f9d 100644 --- a/src/app/app-routing.module.ts +++ b/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) diff --git a/src/app/controller/event.ts b/src/app/controller/event.ts deleted file mode 100644 index b08488d20..000000000 --- a/src/app/controller/event.ts +++ /dev/null @@ -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 - // } - - } - -} diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts index a8e70e987..d6e38e39a 100644 --- a/src/app/home/home-routing.module.ts +++ b/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', diff --git a/src/app/home/home.module.ts b/src/app/home/home.module.ts index e11318398..d19d1b397 100644 --- a/src/app/home/home.module.ts +++ b/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'; 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 index 6529f9c81..20a99db2c 100644 --- a/src/app/modals/chat-options-features/chat-options-features.page.ts +++ b/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'; diff --git a/src/app/modals/view-event/view-event.page.ts b/src/app/modals/view-event/view-event.page.ts index 66386bbe6..e18d9475c 100644 --- a/src/app/modals/view-event/view-event.page.ts +++ b/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'; diff --git a/src/app/pages/agenda/agenda-routing.module.ts b/src/app/pages/agenda/agenda-routing.module.ts deleted file mode 100644 index c27c884cb..000000000 --- a/src/app/pages/agenda/agenda-routing.module.ts +++ /dev/null @@ -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 {} diff --git a/src/app/pages/events/attendees/attendees.page.ts b/src/app/pages/events/attendees/attendees.page.ts index 1466b46fd..e2141405c 100644 --- a/src/app/pages/events/attendees/attendees.page.ts +++ b/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'; diff --git a/src/app/pages/gabinete-digital/diplomas/diplomas.module.ts b/src/app/pages/gabinete-digital/diplomas/diplomas.module.ts index 639945b28..446c341a0 100644 --- a/src/app/pages/gabinete-digital/diplomas/diplomas.module.ts +++ b/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'; diff --git a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts b/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts index 2fa16d4ad..e340685d6 100644 --- a/src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts +++ b/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' 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 14ce4936e..2645e9ad8 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 @@ -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'; diff --git a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts b/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts index ea30d5e16..86897d3e2 100644 --- a/src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts +++ b/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'; diff --git a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts b/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts index 542a72252..72e440b32 100644 --- a/src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts +++ b/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'; diff --git a/src/app/pages/search/search.page.ts b/src/app/pages/search/search.page.ts index e90e83667..dc1d8d94e 100644 --- a/src/app/pages/search/search.page.ts +++ b/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'; diff --git a/src/app/ui/agenda/agenda-routing.module.ts b/src/app/ui/agenda/agenda-routing.module.ts new file mode 100644 index 000000000..a183d9cdf --- /dev/null +++ b/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 {} diff --git a/src/app/pages/agenda/agenda.module.ts b/src/app/ui/agenda/agenda.module.ts similarity index 79% rename from src/app/pages/agenda/agenda.module.ts rename to src/app/ui/agenda/agenda.module.ts index ab1e7e563..9ce023091 100644 --- a/src/app/pages/agenda/agenda.module.ts +++ b/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'; diff --git a/src/app/pages/agenda/agenda.page.html b/src/app/ui/agenda/agenda.page.html similarity index 100% rename from src/app/pages/agenda/agenda.page.html rename to src/app/ui/agenda/agenda.page.html diff --git a/src/app/pages/agenda/agenda.page.scss b/src/app/ui/agenda/agenda.page.scss similarity index 100% rename from src/app/pages/agenda/agenda.page.scss rename to src/app/ui/agenda/agenda.page.scss diff --git a/src/app/pages/agenda/agenda.page.spec.ts b/src/app/ui/agenda/agenda.page.spec.ts similarity index 100% rename from src/app/pages/agenda/agenda.page.spec.ts rename to src/app/ui/agenda/agenda.page.spec.ts diff --git a/src/app/pages/agenda/agenda.page.ts b/src/app/ui/agenda/agenda.page.ts similarity index 99% rename from src/app/pages/agenda/agenda.page.ts rename to src/app/ui/agenda/agenda.page.ts index 55043d91f..a62c24270 100644 --- a/src/app/pages/agenda/agenda.page.ts +++ b/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'; diff --git a/src/app/shared/agenda/approve-event/approve-event-routing.module.ts b/src/app/ui/agenda/component/approve-event/approve-event-routing.module.ts similarity index 100% rename from src/app/shared/agenda/approve-event/approve-event-routing.module.ts rename to src/app/ui/agenda/component/approve-event/approve-event-routing.module.ts diff --git a/src/app/shared/agenda/approve-event/approve-event.module.ts b/src/app/ui/agenda/component/approve-event/approve-event.module.ts similarity index 100% rename from src/app/shared/agenda/approve-event/approve-event.module.ts rename to src/app/ui/agenda/component/approve-event/approve-event.module.ts diff --git a/src/app/shared/agenda/approve-event/approve-event.page.html b/src/app/ui/agenda/component/approve-event/approve-event.page.html similarity index 100% rename from src/app/shared/agenda/approve-event/approve-event.page.html rename to src/app/ui/agenda/component/approve-event/approve-event.page.html diff --git a/src/app/shared/agenda/approve-event/approve-event.page.scss b/src/app/ui/agenda/component/approve-event/approve-event.page.scss similarity index 100% rename from src/app/shared/agenda/approve-event/approve-event.page.scss rename to src/app/ui/agenda/component/approve-event/approve-event.page.scss diff --git a/src/app/shared/agenda/approve-event/approve-event.page.spec.ts b/src/app/ui/agenda/component/approve-event/approve-event.page.spec.ts similarity index 100% rename from src/app/shared/agenda/approve-event/approve-event.page.spec.ts rename to src/app/ui/agenda/component/approve-event/approve-event.page.spec.ts diff --git a/src/app/shared/agenda/approve-event/approve-event.page.ts b/src/app/ui/agenda/component/approve-event/approve-event.page.ts similarity index 97% rename from src/app/shared/agenda/approve-event/approve-event.page.ts rename to src/app/ui/agenda/component/approve-event/approve-event.page.ts index 513ef7120..9fa615469 100644 --- a/src/app/shared/agenda/approve-event/approve-event.page.ts +++ b/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', diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve-routing.module.ts b/src/app/ui/agenda/component/edit-event-to-approve/edit-event-to-approve-routing.module.ts similarity index 100% rename from src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve-routing.module.ts rename to src/app/ui/agenda/component/edit-event-to-approve/edit-event-to-approve-routing.module.ts diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.module.ts b/src/app/ui/agenda/component/edit-event-to-approve/edit-event-to-approve.module.ts similarity index 100% rename from src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.module.ts rename to src/app/ui/agenda/component/edit-event-to-approve/edit-event-to-approve.module.ts diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html b/src/app/ui/agenda/component/edit-event-to-approve/edit-event-to-approve.page.html similarity index 100% rename from src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html rename to src/app/ui/agenda/component/edit-event-to-approve/edit-event-to-approve.page.html diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.scss b/src/app/ui/agenda/component/edit-event-to-approve/edit-event-to-approve.page.scss similarity index 100% rename from src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.scss rename to src/app/ui/agenda/component/edit-event-to-approve/edit-event-to-approve.page.scss diff --git a/src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.spec.ts b/src/app/ui/agenda/component/edit-event-to-approve/edit-event-to-approve.page.spec.ts similarity index 100% rename from src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.spec.ts rename to src/app/ui/agenda/component/edit-event-to-approve/edit-event-to-approve.page.spec.ts diff --git a/src/app/shared/agenda/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 similarity index 100% rename from src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts rename to src/app/ui/agenda/component/edit-event-to-approve/edit-event-to-approve.page.ts diff --git a/src/app/pages/agenda/edit-event/edit-event-routing.module.ts b/src/app/ui/agenda/component/edit-event/edit-event-routing.module.ts similarity index 100% rename from src/app/pages/agenda/edit-event/edit-event-routing.module.ts rename to src/app/ui/agenda/component/edit-event/edit-event-routing.module.ts diff --git a/src/app/shared/agenda/edit-event/edit-event.module.ts b/src/app/ui/agenda/component/edit-event/edit-event.module.ts similarity index 100% rename from src/app/shared/agenda/edit-event/edit-event.module.ts rename to src/app/ui/agenda/component/edit-event/edit-event.module.ts diff --git a/src/app/shared/agenda/edit-event/edit-event.page.html b/src/app/ui/agenda/component/edit-event/edit-event.page.html similarity index 100% rename from src/app/shared/agenda/edit-event/edit-event.page.html rename to src/app/ui/agenda/component/edit-event/edit-event.page.html diff --git a/src/app/shared/agenda/edit-event/edit-event.page.scss b/src/app/ui/agenda/component/edit-event/edit-event.page.scss similarity index 100% rename from src/app/shared/agenda/edit-event/edit-event.page.scss rename to src/app/ui/agenda/component/edit-event/edit-event.page.scss diff --git a/src/app/shared/agenda/edit-event/edit-event.page.spec.ts b/src/app/ui/agenda/component/edit-event/edit-event.page.spec.ts similarity index 100% rename from src/app/shared/agenda/edit-event/edit-event.page.spec.ts rename to src/app/ui/agenda/component/edit-event/edit-event.page.spec.ts diff --git a/src/app/shared/agenda/edit-event/edit-event.page.ts b/src/app/ui/agenda/component/edit-event/edit-event.page.ts similarity index 97% rename from src/app/shared/agenda/edit-event/edit-event.page.ts rename to src/app/ui/agenda/component/edit-event/edit-event.page.ts index 7b60c542e..edb2d03f3 100644 --- a/src/app/shared/agenda/edit-event/edit-event.page.ts +++ b/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 diff --git a/src/app/shared/agenda/event-list/event-list-routing.module.ts b/src/app/ui/agenda/component/event-list/event-list-routing.module.ts similarity index 100% rename from src/app/shared/agenda/event-list/event-list-routing.module.ts rename to src/app/ui/agenda/component/event-list/event-list-routing.module.ts diff --git a/src/app/shared/agenda/event-list/event-list.module.ts b/src/app/ui/agenda/component/event-list/event-list.module.ts similarity index 100% rename from src/app/shared/agenda/event-list/event-list.module.ts rename to src/app/ui/agenda/component/event-list/event-list.module.ts diff --git a/src/app/shared/agenda/event-list/event-list.page.html b/src/app/ui/agenda/component/event-list/event-list.page.html similarity index 100% rename from src/app/shared/agenda/event-list/event-list.page.html rename to src/app/ui/agenda/component/event-list/event-list.page.html diff --git a/src/app/shared/agenda/event-list/event-list.page.scss b/src/app/ui/agenda/component/event-list/event-list.page.scss similarity index 100% rename from src/app/shared/agenda/event-list/event-list.page.scss rename to src/app/ui/agenda/component/event-list/event-list.page.scss diff --git a/src/app/shared/agenda/event-list/event-list.page.spec.ts b/src/app/ui/agenda/component/event-list/event-list.page.spec.ts similarity index 100% rename from src/app/shared/agenda/event-list/event-list.page.spec.ts rename to src/app/ui/agenda/component/event-list/event-list.page.spec.ts diff --git a/src/app/shared/agenda/event-list/event-list.page.ts b/src/app/ui/agenda/component/event-list/event-list.page.ts similarity index 100% rename from src/app/shared/agenda/event-list/event-list.page.ts rename to src/app/ui/agenda/component/event-list/event-list.page.ts diff --git a/src/app/pages/agenda/new-event/new-event-routing.module.ts b/src/app/ui/agenda/component/new-event/new-event-routing.module.ts similarity index 100% rename from src/app/pages/agenda/new-event/new-event-routing.module.ts rename to src/app/ui/agenda/component/new-event/new-event-routing.module.ts diff --git a/src/app/shared/agenda/new-event/new-event.module.ts b/src/app/ui/agenda/component/new-event/new-event.module.ts similarity index 100% rename from src/app/shared/agenda/new-event/new-event.module.ts rename to src/app/ui/agenda/component/new-event/new-event.module.ts diff --git a/src/app/shared/agenda/new-event/new-event.page.html b/src/app/ui/agenda/component/new-event/new-event.page.html similarity index 100% rename from src/app/shared/agenda/new-event/new-event.page.html rename to src/app/ui/agenda/component/new-event/new-event.page.html diff --git a/src/app/shared/agenda/new-event/new-event.page.scss b/src/app/ui/agenda/component/new-event/new-event.page.scss similarity index 100% rename from src/app/shared/agenda/new-event/new-event.page.scss rename to src/app/ui/agenda/component/new-event/new-event.page.scss diff --git a/src/app/shared/agenda/new-event/new-event.page.spec.ts b/src/app/ui/agenda/component/new-event/new-event.page.spec.ts similarity index 100% rename from src/app/shared/agenda/new-event/new-event.page.spec.ts rename to src/app/ui/agenda/component/new-event/new-event.page.spec.ts diff --git a/src/app/shared/agenda/new-event/new-event.page.ts b/src/app/ui/agenda/component/new-event/new-event.page.ts similarity index 100% rename from src/app/shared/agenda/new-event/new-event.page.ts rename to src/app/ui/agenda/component/new-event/new-event.page.ts diff --git a/src/app/pages/agenda/view-event/view-event-routing.module.ts b/src/app/ui/agenda/component/view-event/view-event-routing.module.ts similarity index 100% rename from src/app/pages/agenda/view-event/view-event-routing.module.ts rename to src/app/ui/agenda/component/view-event/view-event-routing.module.ts diff --git a/src/app/shared/agenda/view-event/view-event.module.ts b/src/app/ui/agenda/component/view-event/view-event.module.ts similarity index 100% rename from src/app/shared/agenda/view-event/view-event.module.ts rename to src/app/ui/agenda/component/view-event/view-event.module.ts diff --git a/src/app/shared/agenda/view-event/view-event.page.html b/src/app/ui/agenda/component/view-event/view-event.page.html similarity index 100% rename from src/app/shared/agenda/view-event/view-event.page.html rename to src/app/ui/agenda/component/view-event/view-event.page.html diff --git a/src/app/shared/agenda/view-event/view-event.page.scss b/src/app/ui/agenda/component/view-event/view-event.page.scss similarity index 100% rename from src/app/shared/agenda/view-event/view-event.page.scss rename to src/app/ui/agenda/component/view-event/view-event.page.scss diff --git a/src/app/pages/agenda/view-event/view-event.page.spec.ts b/src/app/ui/agenda/component/view-event/view-event.page.spec.ts similarity index 100% rename from src/app/pages/agenda/view-event/view-event.page.spec.ts rename to src/app/ui/agenda/component/view-event/view-event.page.spec.ts diff --git a/src/app/shared/agenda/view-event/view-event.page.ts b/src/app/ui/agenda/component/view-event/view-event.page.ts similarity index 96% rename from src/app/shared/agenda/view-event/view-event.page.ts rename to src/app/ui/agenda/component/view-event/view-event.page.ts index dd0a55fde..498fadca7 100644 --- a/src/app/shared/agenda/view-event/view-event.page.ts +++ b/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() { diff --git a/src/app/pages/agenda/custom-date-formatter.provider.ts b/src/app/ui/agenda/custom-date-formatter.provider.ts similarity index 100% rename from src/app/pages/agenda/custom-date-formatter.provider.ts rename to src/app/ui/agenda/custom-date-formatter.provider.ts diff --git a/src/app/shared/agenda/edit-event/edit-event-routing.module.ts b/src/app/ui/agenda/modal/edit-event/edit-event-routing.module.ts similarity index 100% rename from src/app/shared/agenda/edit-event/edit-event-routing.module.ts rename to src/app/ui/agenda/modal/edit-event/edit-event-routing.module.ts diff --git a/src/app/pages/agenda/edit-event/edit-event.module.ts b/src/app/ui/agenda/modal/edit-event/edit-event.module.ts similarity index 100% rename from src/app/pages/agenda/edit-event/edit-event.module.ts rename to src/app/ui/agenda/modal/edit-event/edit-event.module.ts diff --git a/src/app/pages/agenda/edit-event/edit-event.page.html b/src/app/ui/agenda/modal/edit-event/edit-event.page.html similarity index 100% rename from src/app/pages/agenda/edit-event/edit-event.page.html rename to src/app/ui/agenda/modal/edit-event/edit-event.page.html diff --git a/src/app/pages/agenda/edit-event/edit-event.page.scss b/src/app/ui/agenda/modal/edit-event/edit-event.page.scss similarity index 100% rename from src/app/pages/agenda/edit-event/edit-event.page.scss rename to src/app/ui/agenda/modal/edit-event/edit-event.page.scss diff --git a/src/app/pages/agenda/edit-event/edit-event.page.spec.ts b/src/app/ui/agenda/modal/edit-event/edit-event.page.spec.ts similarity index 100% rename from src/app/pages/agenda/edit-event/edit-event.page.spec.ts rename to src/app/ui/agenda/modal/edit-event/edit-event.page.spec.ts diff --git a/src/app/pages/agenda/edit-event/edit-event.page.ts b/src/app/ui/agenda/modal/edit-event/edit-event.page.ts similarity index 96% rename from src/app/pages/agenda/edit-event/edit-event.page.ts rename to src/app/ui/agenda/modal/edit-event/edit-event.page.ts index 99338f8b5..f825ba55c 100644 --- a/src/app/pages/agenda/edit-event/edit-event.page.ts +++ b/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') { diff --git a/src/app/pages/agenda/emend-message-modal/emend-message-modal-routing.module.ts b/src/app/ui/agenda/modal/emend-message-modal/emend-message-modal-routing.module.ts similarity index 100% rename from src/app/pages/agenda/emend-message-modal/emend-message-modal-routing.module.ts rename to src/app/ui/agenda/modal/emend-message-modal/emend-message-modal-routing.module.ts diff --git a/src/app/pages/agenda/emend-message-modal/emend-message-modal.module.ts b/src/app/ui/agenda/modal/emend-message-modal/emend-message-modal.module.ts similarity index 100% rename from src/app/pages/agenda/emend-message-modal/emend-message-modal.module.ts rename to src/app/ui/agenda/modal/emend-message-modal/emend-message-modal.module.ts diff --git a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html b/src/app/ui/agenda/modal/emend-message-modal/emend-message-modal.page.html similarity index 100% rename from src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html rename to src/app/ui/agenda/modal/emend-message-modal/emend-message-modal.page.html diff --git a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.scss b/src/app/ui/agenda/modal/emend-message-modal/emend-message-modal.page.scss similarity index 100% rename from src/app/pages/agenda/emend-message-modal/emend-message-modal.page.scss rename to src/app/ui/agenda/modal/emend-message-modal/emend-message-modal.page.scss diff --git a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.spec.ts b/src/app/ui/agenda/modal/emend-message-modal/emend-message-modal.page.spec.ts similarity index 100% rename from src/app/pages/agenda/emend-message-modal/emend-message-modal.page.spec.ts rename to src/app/ui/agenda/modal/emend-message-modal/emend-message-modal.page.spec.ts diff --git a/src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts b/src/app/ui/agenda/modal/emend-message-modal/emend-message-modal.page.ts similarity index 100% rename from src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts rename to src/app/ui/agenda/modal/emend-message-modal/emend-message-modal.page.ts diff --git a/src/app/pages/agenda/event-actions-popover/event-actions-popover-routing.module.ts b/src/app/ui/agenda/modal/event-actions-popover/event-actions-popover-routing.module.ts similarity index 100% rename from src/app/pages/agenda/event-actions-popover/event-actions-popover-routing.module.ts rename to src/app/ui/agenda/modal/event-actions-popover/event-actions-popover-routing.module.ts diff --git a/src/app/pages/agenda/event-actions-popover/event-actions-popover.module.ts b/src/app/ui/agenda/modal/event-actions-popover/event-actions-popover.module.ts similarity index 100% rename from src/app/pages/agenda/event-actions-popover/event-actions-popover.module.ts rename to src/app/ui/agenda/modal/event-actions-popover/event-actions-popover.module.ts diff --git a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html b/src/app/ui/agenda/modal/event-actions-popover/event-actions-popover.page.html similarity index 100% rename from src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html rename to src/app/ui/agenda/modal/event-actions-popover/event-actions-popover.page.html diff --git a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.scss b/src/app/ui/agenda/modal/event-actions-popover/event-actions-popover.page.scss similarity index 100% rename from src/app/pages/agenda/event-actions-popover/event-actions-popover.page.scss rename to src/app/ui/agenda/modal/event-actions-popover/event-actions-popover.page.scss diff --git a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.spec.ts b/src/app/ui/agenda/modal/event-actions-popover/event-actions-popover.page.spec.ts similarity index 100% rename from src/app/pages/agenda/event-actions-popover/event-actions-popover.page.spec.ts rename to src/app/ui/agenda/modal/event-actions-popover/event-actions-popover.page.spec.ts diff --git a/src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts b/src/app/ui/agenda/modal/event-actions-popover/event-actions-popover.page.ts similarity index 100% rename from src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts rename to src/app/ui/agenda/modal/event-actions-popover/event-actions-popover.page.ts diff --git a/src/app/shared/agenda/new-event/new-event-routing.module.ts b/src/app/ui/agenda/modal/new-event/new-event-routing.module.ts similarity index 100% rename from src/app/shared/agenda/new-event/new-event-routing.module.ts rename to src/app/ui/agenda/modal/new-event/new-event-routing.module.ts diff --git a/src/app/pages/agenda/new-event/new-event.module.ts b/src/app/ui/agenda/modal/new-event/new-event.module.ts similarity index 100% rename from src/app/pages/agenda/new-event/new-event.module.ts rename to src/app/ui/agenda/modal/new-event/new-event.module.ts diff --git a/src/app/pages/agenda/new-event/new-event.page.html b/src/app/ui/agenda/modal/new-event/new-event.page.html similarity index 100% rename from src/app/pages/agenda/new-event/new-event.page.html rename to src/app/ui/agenda/modal/new-event/new-event.page.html diff --git a/src/app/pages/agenda/new-event/new-event.page.scss b/src/app/ui/agenda/modal/new-event/new-event.page.scss similarity index 100% rename from src/app/pages/agenda/new-event/new-event.page.scss rename to src/app/ui/agenda/modal/new-event/new-event.page.scss diff --git a/src/app/pages/agenda/new-event/new-event.page.spec.ts b/src/app/ui/agenda/modal/new-event/new-event.page.spec.ts similarity index 100% rename from src/app/pages/agenda/new-event/new-event.page.spec.ts rename to src/app/ui/agenda/modal/new-event/new-event.page.spec.ts diff --git a/src/app/pages/agenda/new-event/new-event.page.ts b/src/app/ui/agenda/modal/new-event/new-event.page.ts similarity index 98% rename from src/app/pages/agenda/new-event/new-event.page.ts rename to src/app/ui/agenda/modal/new-event/new-event.page.ts index fcb35f993..e1d40cc40 100644 --- a/src/app/pages/agenda/new-event/new-event.page.ts +++ b/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'; diff --git a/src/app/shared/agenda/view-event/view-event-routing.module.ts b/src/app/ui/agenda/modal/view-event/view-event-routing.module.ts similarity index 100% rename from src/app/shared/agenda/view-event/view-event-routing.module.ts rename to src/app/ui/agenda/modal/view-event/view-event-routing.module.ts diff --git a/src/app/pages/agenda/view-event/view-event.module.ts b/src/app/ui/agenda/modal/view-event/view-event.module.ts similarity index 100% rename from src/app/pages/agenda/view-event/view-event.module.ts rename to src/app/ui/agenda/modal/view-event/view-event.module.ts diff --git a/src/app/pages/agenda/view-event/view-event.page.html b/src/app/ui/agenda/modal/view-event/view-event.page.html similarity index 100% rename from src/app/pages/agenda/view-event/view-event.page.html rename to src/app/ui/agenda/modal/view-event/view-event.page.html diff --git a/src/app/pages/agenda/view-event/view-event.page.scss b/src/app/ui/agenda/modal/view-event/view-event.page.scss similarity index 100% rename from src/app/pages/agenda/view-event/view-event.page.scss rename to src/app/ui/agenda/modal/view-event/view-event.page.scss diff --git a/src/app/shared/agenda/view-event/view-event.page.spec.ts b/src/app/ui/agenda/modal/view-event/view-event.page.spec.ts similarity index 100% rename from src/app/shared/agenda/view-event/view-event.page.spec.ts rename to src/app/ui/agenda/modal/view-event/view-event.page.spec.ts diff --git a/src/app/pages/agenda/view-event/view-event.page.ts b/src/app/ui/agenda/modal/view-event/view-event.page.ts similarity index 98% rename from src/app/pages/agenda/view-event/view-event.page.ts rename to src/app/ui/agenda/modal/view-event/view-event.page.ts index 8409dbf7b..1101171d6 100644 --- a/src/app/pages/agenda/view-event/view-event.page.ts +++ b/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'; diff --git a/src/app/ui/chat/chat.module.ts b/src/app/ui/chat/chat.module.ts index 6e75bd935..0998db293 100644 --- a/src/app/ui/chat/chat.module.ts +++ b/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'; diff --git a/src/app/ui/chat/modal/chat-options-popover/chat-options-popover.page.ts b/src/app/ui/chat/modal/chat-options-popover/chat-options-popover.page.ts index 403c48078..e0af07340 100644 --- a/src/app/ui/chat/modal/chat-options-popover/chat-options-popover.page.ts +++ b/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' diff --git a/src/app/shared/header-pr/header-pr-routing.module.ts b/src/app/ui/shared/components/header-pr/header-pr-routing.module.ts similarity index 100% rename from src/app/shared/header-pr/header-pr-routing.module.ts rename to src/app/ui/shared/components/header-pr/header-pr-routing.module.ts diff --git a/src/app/shared/header-pr/header-pr.module.ts b/src/app/ui/shared/components/header-pr/header-pr.module.ts similarity index 100% rename from src/app/shared/header-pr/header-pr.module.ts rename to src/app/ui/shared/components/header-pr/header-pr.module.ts diff --git a/src/app/shared/header-pr/header-pr.page.html b/src/app/ui/shared/components/header-pr/header-pr.page.html similarity index 100% rename from src/app/shared/header-pr/header-pr.page.html rename to src/app/ui/shared/components/header-pr/header-pr.page.html diff --git a/src/app/shared/header-pr/header-pr.page.scss b/src/app/ui/shared/components/header-pr/header-pr.page.scss similarity index 100% rename from src/app/shared/header-pr/header-pr.page.scss rename to src/app/ui/shared/components/header-pr/header-pr.page.scss diff --git a/src/app/shared/header-pr/header-pr.page.spec.ts b/src/app/ui/shared/components/header-pr/header-pr.page.spec.ts similarity index 100% rename from src/app/shared/header-pr/header-pr.page.spec.ts rename to src/app/ui/shared/components/header-pr/header-pr.page.spec.ts diff --git a/src/app/shared/header-pr/header-pr.page.ts b/src/app/ui/shared/components/header-pr/header-pr.page.ts similarity index 100% rename from src/app/shared/header-pr/header-pr.page.ts rename to src/app/ui/shared/components/header-pr/header-pr.page.ts diff --git a/src/app/shared/header/header-routing.module.ts b/src/app/ui/shared/components/header/header-routing.module.ts similarity index 100% rename from src/app/shared/header/header-routing.module.ts rename to src/app/ui/shared/components/header/header-routing.module.ts diff --git a/src/app/shared/header/header.module.ts b/src/app/ui/shared/components/header/header.module.ts similarity index 100% rename from src/app/shared/header/header.module.ts rename to src/app/ui/shared/components/header/header.module.ts diff --git a/src/app/shared/header/header.page.html b/src/app/ui/shared/components/header/header.page.html similarity index 100% rename from src/app/shared/header/header.page.html rename to src/app/ui/shared/components/header/header.page.html diff --git a/src/app/shared/header/header.page.scss b/src/app/ui/shared/components/header/header.page.scss similarity index 100% rename from src/app/shared/header/header.page.scss rename to src/app/ui/shared/components/header/header.page.scss diff --git a/src/app/shared/header/header.page.spec.ts b/src/app/ui/shared/components/header/header.page.spec.ts similarity index 100% rename from src/app/shared/header/header.page.spec.ts rename to src/app/ui/shared/components/header/header.page.spec.ts diff --git a/src/app/shared/header/header.page.ts b/src/app/ui/shared/components/header/header.page.ts similarity index 98% rename from src/app/shared/header/header.page.ts rename to src/app/ui/shared/components/header/header.page.ts index a9286d593..3cc919426 100644 --- a/src/app/shared/header/header.page.ts +++ b/src/app/ui/shared/components/header/header.page.ts @@ -4,10 +4,10 @@ import { SearchPage } from 'src/app/pages/search/search.page'; import { Router } from '@angular/router'; import { LoginUserRespose } from 'src/app/models/user.model'; import { ProfilePage } from 'src/app/modals/profile/profile.page'; -import { StorageService } from '../../services/storage.service'; +import { StorageService } from '../../../../services/storage.service'; import { SessionStore } from 'src/app/store/session.service'; import { environment } from 'src/environments/environment'; -import { ThemeService } from '../../services/theme.service'; +import { ThemeService } from '../../../../services/theme.service'; import { RouteService } from 'src/app/services/route.service'; import { PermissionList } from 'src/app/models/permission/permissionList'; import { PermissionService } from 'src/app/services/permission.service'; diff --git a/version/git-version.ts b/version/git-version.ts index 19e4b6a32..155518d13 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,11 +1,11 @@ export let versionData = { - "shortSHA": "bb93726fc", - "SHA": "bb93726fc2e569fb8b6ccad03229be8e084bce58", + "shortSHA": "8484b1b60", + "SHA": "8484b1b60055d965d74f13841de8f9ea84981bbe", "branch": "feature/chat-new-api-peter", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Thu Oct 17 22:32:43 2024 +0100'", - "lastCommitMessage": "add ,", - "lastCommitNumber": "6100", - "changeStatus": "On branch feature/chat-new-api-peter\nYour branch is up to date with 'origin/feature/chat-new-api-peter'.\n\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tnew file: src/app/core/agenda/entity/event.ts\n\tnew file: src/app/core/agenda/repository/agenda-repository.ts\n\tnew file: src/app/core/agenda/use-case/event-create.service.ts\n\tnew file: src/app/core/agenda/use-case/event-set-default-participants.service.ts\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/domain/agenda.service.ts\n\tmodified: src/app/module/agenda/domain/mapper/EventListMapper.ts\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/pages/agenda/new-event/new-event.page.ts\n\tmodified: src/app/pages/events/events.page.ts\n\tmodified: src/app/services/events.service.ts\n\tmodified: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html\n\tmodified: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts\n\tmodified: src/app/shared/agenda/edit-event/edit-event.page.ts\n\tmodified: src/app/shared/agenda/new-event/new-event.page.html\n\tmodified: src/app/shared/agenda/new-event/new-event.page.ts\n\tmodified: src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.html\n\tmodified: src/app/shared/gabinete-digital/edit-event-to-approve/edit-event.page.ts", + "lastCommitTime": "'Fri Oct 18 11:34:39 2024 +0100'", + "lastCommitMessage": "remove unsude code", + "lastCommitNumber": "6101", + "changeStatus": "On branch feature/chat-new-api-peter\nYour branch is ahead of 'origin/feature/chat-new-api-peter' by 1 commit.\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/app-routing.module.ts\n\tdeleted: src/app/controller/event.ts\n\tmodified: src/app/home/home-routing.module.ts\n\tmodified: src/app/home/home.module.ts\n\tmodified: src/app/modals/chat-options-features/chat-options-features.page.ts\n\tmodified: src/app/modals/view-event/view-event.page.ts\n\tdeleted: src/app/pages/agenda/agenda-routing.module.ts\n\tmodified: src/app/pages/events/attendees/attendees.page.ts\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.module.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.ts\n\tmodified: src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.ts\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.ts\n\tmodified: src/app/pages/search/search.page.ts\n\tnew file: src/app/ui/agenda/agenda-routing.module.ts\n\trenamed: src/app/pages/agenda/agenda.module.ts -> src/app/ui/agenda/agenda.module.ts\n\trenamed: src/app/pages/agenda/agenda.page.html -> src/app/ui/agenda/agenda.page.html\n\trenamed: src/app/pages/agenda/agenda.page.scss -> src/app/ui/agenda/agenda.page.scss\n\trenamed: src/app/pages/agenda/agenda.page.spec.ts -> src/app/ui/agenda/agenda.page.spec.ts\n\trenamed: src/app/pages/agenda/agenda.page.ts -> src/app/ui/agenda/agenda.page.ts\n\trenamed: src/app/shared/agenda/approve-event/approve-event-routing.module.ts -> src/app/ui/agenda/component/approve-event/approve-event-routing.module.ts\n\trenamed: src/app/shared/agenda/approve-event/approve-event.module.ts -> src/app/ui/agenda/component/approve-event/approve-event.module.ts\n\trenamed: src/app/shared/agenda/approve-event/approve-event.page.html -> src/app/ui/agenda/component/approve-event/approve-event.page.html\n\trenamed: src/app/shared/agenda/approve-event/approve-event.page.scss -> src/app/ui/agenda/component/approve-event/approve-event.page.scss\n\trenamed: src/app/shared/agenda/approve-event/approve-event.page.spec.ts -> src/app/ui/agenda/component/approve-event/approve-event.page.spec.ts\n\trenamed: src/app/shared/agenda/approve-event/approve-event.page.ts -> src/app/ui/agenda/component/approve-event/approve-event.page.ts\n\trenamed: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve-routing.module.ts -> src/app/ui/agenda/component/edit-event-to-approve/edit-event-to-approve-routing.module.ts\n\trenamed: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.module.ts -> src/app/ui/agenda/component/edit-event-to-approve/edit-event-to-approve.module.ts\n\trenamed: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.html -> src/app/ui/agenda/component/edit-event-to-approve/edit-event-to-approve.page.html\n\trenamed: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.scss -> src/app/ui/agenda/component/edit-event-to-approve/edit-event-to-approve.page.scss\n\trenamed: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.spec.ts -> src/app/ui/agenda/component/edit-event-to-approve/edit-event-to-approve.page.spec.ts\n\trenamed: src/app/shared/agenda/edit-event-to-approve/edit-event-to-approve.page.ts -> src/app/ui/agenda/component/edit-event-to-approve/edit-event-to-approve.page.ts\n\trenamed: src/app/pages/agenda/edit-event/edit-event-routing.module.ts -> src/app/ui/agenda/component/edit-event/edit-event-routing.module.ts\n\trenamed: src/app/shared/agenda/edit-event/edit-event.module.ts -> src/app/ui/agenda/component/edit-event/edit-event.module.ts\n\trenamed: src/app/shared/agenda/edit-event/edit-event.page.html -> src/app/ui/agenda/component/edit-event/edit-event.page.html\n\trenamed: src/app/shared/agenda/edit-event/edit-event.page.scss -> src/app/ui/agenda/component/edit-event/edit-event.page.scss\n\trenamed: src/app/shared/agenda/edit-event/edit-event.page.spec.ts -> src/app/ui/agenda/component/edit-event/edit-event.page.spec.ts\n\trenamed: src/app/shared/agenda/edit-event/edit-event.page.ts -> src/app/ui/agenda/component/edit-event/edit-event.page.ts\n\trenamed: src/app/shared/agenda/event-list/event-list-routing.module.ts -> src/app/ui/agenda/component/event-list/event-list-routing.module.ts\n\trenamed: src/app/shared/agenda/event-list/event-list.module.ts -> src/app/ui/agenda/component/event-list/event-list.module.ts\n\trenamed: src/app/shared/agenda/event-list/event-list.page.html -> src/app/ui/agenda/component/event-list/event-list.page.html\n\trenamed: src/app/shared/agenda/event-list/event-list.page.scss -> src/app/ui/agenda/component/event-list/event-list.page.scss\n\trenamed: src/app/shared/agenda/event-list/event-list.page.spec.ts -> src/app/ui/agenda/component/event-list/event-list.page.spec.ts\n\trenamed: src/app/shared/agenda/event-list/event-list.page.ts -> src/app/ui/agenda/component/event-list/event-list.page.ts\n\trenamed: src/app/pages/agenda/new-event/new-event-routing.module.ts -> src/app/ui/agenda/component/new-event/new-event-routing.module.ts\n\trenamed: src/app/shared/agenda/new-event/new-event.module.ts -> src/app/ui/agenda/component/new-event/new-event.module.ts\n\trenamed: src/app/shared/agenda/new-event/new-event.page.html -> src/app/ui/agenda/component/new-event/new-event.page.html\n\trenamed: src/app/shared/agenda/new-event/new-event.page.scss -> src/app/ui/agenda/component/new-event/new-event.page.scss\n\trenamed: src/app/shared/agenda/new-event/new-event.page.spec.ts -> src/app/ui/agenda/component/new-event/new-event.page.spec.ts\n\trenamed: src/app/shared/agenda/new-event/new-event.page.ts -> src/app/ui/agenda/component/new-event/new-event.page.ts\n\trenamed: src/app/pages/agenda/view-event/view-event-routing.module.ts -> src/app/ui/agenda/component/view-event/view-event-routing.module.ts\n\trenamed: src/app/shared/agenda/view-event/view-event.module.ts -> src/app/ui/agenda/component/view-event/view-event.module.ts\n\trenamed: src/app/shared/agenda/view-event/view-event.page.html -> src/app/ui/agenda/component/view-event/view-event.page.html\n\trenamed: src/app/shared/agenda/view-event/view-event.page.scss -> src/app/ui/agenda/component/view-event/view-event.page.scss\n\trenamed: src/app/pages/agenda/view-event/view-event.page.spec.ts -> src/app/ui/agenda/component/view-event/view-event.page.spec.ts\n\trenamed: src/app/shared/agenda/view-event/view-event.page.ts -> src/app/ui/agenda/component/view-event/view-event.page.ts\n\trenamed: src/app/pages/agenda/custom-date-formatter.provider.ts -> src/app/ui/agenda/custom-date-formatter.provider.ts\n\trenamed: src/app/shared/agenda/edit-event/edit-event-routing.module.ts -> src/app/ui/agenda/modal/edit-event/edit-event-routing.module.ts\n\trenamed: src/app/pages/agenda/edit-event/edit-event.module.ts -> src/app/ui/agenda/modal/edit-event/edit-event.module.ts\n\trenamed: src/app/pages/agenda/edit-event/edit-event.page.html -> src/app/ui/agenda/modal/edit-event/edit-event.page.html\n\trenamed: src/app/pages/agenda/edit-event/edit-event.page.scss -> src/app/ui/agenda/modal/edit-event/edit-event.page.scss\n\trenamed: src/app/pages/agenda/edit-event/edit-event.page.spec.ts -> src/app/ui/agenda/modal/edit-event/edit-event.page.spec.ts\n\trenamed: src/app/pages/agenda/edit-event/edit-event.page.ts -> src/app/ui/agenda/modal/edit-event/edit-event.page.ts\n\trenamed: src/app/pages/agenda/emend-message-modal/emend-message-modal-routing.module.ts -> src/app/ui/agenda/modal/emend-message-modal/emend-message-modal-routing.module.ts\n\trenamed: src/app/pages/agenda/emend-message-modal/emend-message-modal.module.ts -> src/app/ui/agenda/modal/emend-message-modal/emend-message-modal.module.ts\n\trenamed: src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html -> src/app/ui/agenda/modal/emend-message-modal/emend-message-modal.page.html\n\trenamed: src/app/pages/agenda/emend-message-modal/emend-message-modal.page.scss -> src/app/ui/agenda/modal/emend-message-modal/emend-message-modal.page.scss\n\trenamed: src/app/pages/agenda/emend-message-modal/emend-message-modal.page.spec.ts -> src/app/ui/agenda/modal/emend-message-modal/emend-message-modal.page.spec.ts\n\trenamed: src/app/pages/agenda/emend-message-modal/emend-message-modal.page.ts -> src/app/ui/agenda/modal/emend-message-modal/emend-message-modal.page.ts\n\trenamed: src/app/pages/agenda/event-actions-popover/event-actions-popover-routing.module.ts -> src/app/ui/agenda/modal/event-actions-popover/event-actions-popover-routing.module.ts\n\trenamed: src/app/pages/agenda/event-actions-popover/event-actions-popover.module.ts -> src/app/ui/agenda/modal/event-actions-popover/event-actions-popover.module.ts\n\trenamed: src/app/pages/agenda/event-actions-popover/event-actions-popover.page.html -> src/app/ui/agenda/modal/event-actions-popover/event-actions-popover.page.html\n\trenamed: src/app/pages/agenda/event-actions-popover/event-actions-popover.page.scss -> src/app/ui/agenda/modal/event-actions-popover/event-actions-popover.page.scss\n\trenamed: src/app/pages/agenda/event-actions-popover/event-actions-popover.page.spec.ts -> src/app/ui/agenda/modal/event-actions-popover/event-actions-popover.page.spec.ts\n\trenamed: src/app/pages/agenda/event-actions-popover/event-actions-popover.page.ts -> src/app/ui/agenda/modal/event-actions-popover/event-actions-popover.page.ts\n\trenamed: src/app/shared/agenda/new-event/new-event-routing.module.ts -> src/app/ui/agenda/modal/new-event/new-event-routing.module.ts\n\trenamed: src/app/pages/agenda/new-event/new-event.module.ts -> src/app/ui/agenda/modal/new-event/new-event.module.ts\n\trenamed: src/app/pages/agenda/new-event/new-event.page.html -> src/app/ui/agenda/modal/new-event/new-event.page.html\n\trenamed: src/app/pages/agenda/new-event/new-event.page.scss -> src/app/ui/agenda/modal/new-event/new-event.page.scss\n\trenamed: src/app/pages/agenda/new-event/new-event.page.spec.ts -> src/app/ui/agenda/modal/new-event/new-event.page.spec.ts\n\trenamed: src/app/pages/agenda/new-event/new-event.page.ts -> src/app/ui/agenda/modal/new-event/new-event.page.ts\n\trenamed: src/app/shared/agenda/view-event/view-event-routing.module.ts -> src/app/ui/agenda/modal/view-event/view-event-routing.module.ts\n\trenamed: src/app/pages/agenda/view-event/view-event.module.ts -> src/app/ui/agenda/modal/view-event/view-event.module.ts\n\trenamed: src/app/pages/agenda/view-event/view-event.page.html -> src/app/ui/agenda/modal/view-event/view-event.page.html\n\trenamed: src/app/pages/agenda/view-event/view-event.page.scss -> src/app/ui/agenda/modal/view-event/view-event.page.scss\n\trenamed: src/app/shared/agenda/view-event/view-event.page.spec.ts -> src/app/ui/agenda/modal/view-event/view-event.page.spec.ts\n\trenamed: src/app/pages/agenda/view-event/view-event.page.ts -> src/app/ui/agenda/modal/view-event/view-event.page.ts\n\tmodified: src/app/ui/chat/chat.module.ts\n\tmodified: src/app/ui/chat/modal/chat-options-popover/chat-options-popover.page.ts\n\trenamed: src/app/shared/header-pr/header-pr-routing.module.ts -> src/app/ui/shared/components/header-pr/header-pr-routing.module.ts\n\trenamed: src/app/shared/header-pr/header-pr.module.ts -> src/app/ui/shared/components/header-pr/header-pr.module.ts\n\trenamed: src/app/shared/header-pr/header-pr.page.html -> src/app/ui/shared/components/header-pr/header-pr.page.html\n\trenamed: src/app/shared/header-pr/header-pr.page.scss -> src/app/ui/shared/components/header-pr/header-pr.page.scss\n\trenamed: src/app/shared/header-pr/header-pr.page.spec.ts -> src/app/ui/shared/components/header-pr/header-pr.page.spec.ts\n\trenamed: src/app/shared/header-pr/header-pr.page.ts -> src/app/ui/shared/components/header-pr/header-pr.page.ts\n\trenamed: src/app/shared/header/header-routing.module.ts -> src/app/ui/shared/components/header/header-routing.module.ts\n\trenamed: src/app/shared/header/header.module.ts -> src/app/ui/shared/components/header/header.module.ts\n\trenamed: src/app/shared/header/header.page.html -> src/app/ui/shared/components/header/header.page.html\n\trenamed: src/app/shared/header/header.page.scss -> src/app/ui/shared/components/header/header.page.scss\n\trenamed: src/app/shared/header/header.page.spec.ts -> src/app/ui/shared/components/header/header.page.spec.ts\n\trenamed: src/app/shared/header/header.page.ts -> src/app/ui/shared/components/header/header.page.ts\n\tmodified: version/git-version.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file